Merge remote-tracking branch 'origin/master'

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/entity/OperDefectEntity.java

@@ -104,11 +104,13 @@ public class OperDefectEntity extends TenantEntity {
     /**
      * 区域Id
      */
+    @ApiModelProperty(value = "区域Id")
     @TableField(exist = false)
     private String areaId;
     /**
      * 年月
      */
+    @ApiModelProperty(value = "年月")
     @TableField(exist = false)
     private YearMonth yearMonth;
 }

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/areamonthly/vo/TaskListQuery.java

@@ -126,11 +126,13 @@ public class TaskListQuery implements Serializable {
     /**
      * 月份
      */
+    @ApiModelProperty("月份")
     private YearMonth yearmonth;
 
     /**
      * 区域Id
      */
+    @ApiModelProperty("区域Id")
     private String areaId;
 
 

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CheckMonthEntity.java

@@ -47,6 +47,7 @@ public class CheckMonthEntity extends TenantEntity implements Serializable {
 	 * 年月
 	 */
 	@TableField(exist = false)
+	@ApiModelProperty("月份")
 	private YearMonth yearMonth;
 
 
@@ -55,6 +56,4 @@ public class CheckMonthEntity extends TenantEntity implements Serializable {
 	private String itemName;
 
 
-
-
 }

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/vo/MaintenanceTaskWithAreaVo.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.ticket.areamonthly.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.YearMonth;
@@ -17,33 +18,39 @@ public class MaintenanceTaskWithAreaVo {
     /**
      * 区域编号
      */
+    @ApiModelProperty("区域编号")
     private String areaId;
 
 
     /**
      * 月份
      */
+    @ApiModelProperty("月份")
     private java.time.YearMonth YearMonth;
 
     /**
      * 项目名称
      */
+    @ApiModelProperty("项目名称")
     private  String title;
 
     /**
      * 维护内容
      */
+    @ApiModelProperty("维护内容")
     private  String content;
 
     /**
      * 执行状态
      */
+    @ApiModelProperty("执行状态")
     private Integer status;
 
 
     /**
      * 任务类型
      */
+    @ApiModelProperty("执行状态")
     private String taskType;
 
 }

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/vo/StandardTicketVo.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.ticket.areamonthly.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ import java.util.Date;
  */
 @EqualsAndHashCode
 @Data
+@ApiModel("操作票对象")
 public class StandardTicketVo implements Serializable {
 
     private static final long serialVersionUID = -8870464581684939369L;
@@ -26,91 +28,109 @@ public class StandardTicketVo implements Serializable {
     /**
      * 编号
      */
+    @ApiModelProperty("编号")
     private Long id;
 
 
     /**
      * 开票种类
      */
+    @ApiModelProperty("开票种类")
     private String ticketType;
 
     /**
      * 单位
      */
+    @ApiModelProperty("单位")
     private String company;
     /**
      * 编号
      */
+    @ApiModelProperty("编号")
     private String code;
     /**
      * 开票来源
      */
+    @ApiModelProperty("开票来源")
     private String taskType;
 
 
     /**
      * 开票来源名称
      */
+    @ApiModelProperty("开票来源名称")
     private String taskTypeName;
     /**
      * 开票任务来源
      */
+    @ApiModelProperty("开票任务来源")
     private String taskName;
 
     /**
      * 发令人
      */
+    @ApiModelProperty("发令人")
     private Long issueOrderPerson;
 
     /**
      * 发令人名称
      */
+    @ApiModelProperty("发令人名称")
     private String issueOrderPersonName;
 
 
     /**
      * 受令人
      */
+    @ApiModelProperty("受令人")
     private Long accessOrderPerson;
 
     /**
      * 受令人名称
      */
+    @ApiModelProperty("受令人名称")
     private String accessOrderPersonName;
 
     /**
      * 监护人
      */
+    @ApiModelProperty("监护人")
     private Long guardian;
 
 
     /**
      * 监护人名称
      */
+    @ApiModelProperty("监护人名称")
     private String guardianName;
 
     /**
      * 值班负责人
      */
+    @ApiModelProperty("值班负责人")
     private Long principal;
 
     /**
      * 值班负责人
      */
+    @ApiModelProperty("值班负责人名称")
     private String principalName;
     /**
      * 开票时间
      */
+    @ApiModelProperty("开票时间")
     private Date createTime;
 
     /**
      * 状态
      */
+    @ApiModelProperty("状态")
     private Integer status;
 
     /**
      * 是否评价
      */
+    @ApiModelProperty("是否评价")
     private Integer isEvaluate;
 }
 

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/vo/StandardTicketWithAreaVo.java

@@ -21,34 +21,40 @@ public class StandardTicketWithAreaVo {
     /**
      * 区域编号
      */
+    @ApiModelProperty("区域编号")
     private String areaId;
 
 
     /**
      * 月份
      */
+    @ApiModelProperty("月份")
     private YearMonth YearMonth;
 
 
     /**
      * 开票种类
      */
+    @ApiModelProperty("开票种类")
     private String ticketType;
 
 
     /**
      * 编号
      */
+    @ApiModelProperty("编号")
     private String code;
     /**
      * 开票来源
      */
+    @ApiModelProperty("开票来源")
     private String taskType;
 
 
     /**
      * 状态
      */
+    @ApiModelProperty("状态")
     private Integer status;
 
 

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/areamonthly/vo/StandardWorkVo.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.ticket.areamonthly.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,45 +23,54 @@ public class StandardWorkVo implements Serializable {
     /**
      * 编号
      */
+    @ApiModelProperty("编号")
     private Long id;
 
 
     /**
      * 开票种类
      */
+    @ApiModelProperty("开票种类")
     private String type;
 
     /**
      * 单位
      */
+    @ApiModelProperty("单位")
     private String company;
     /**
      * 编号
      */
+    @ApiModelProperty("编号")
     private String code;
     /**
      * 开票来源
      */
+    @ApiModelProperty("开票来源")
     private String taskType;
     /**
      * 开票任务来源
      */
+    @ApiModelProperty("开票任务来源")
     private String taskName;
 
 
     /**
      * 开票时间
      */
+    @ApiModelProperty("开票时间")
     private Date createTime;
 
     /**
      * 状态
      */
+    @ApiModelProperty("状态")
     private Integer status;
 
     /**
      * 是否评价
      */
+    @ApiModelProperty("是否评价")
     private Integer isEvaluate;
 }
 

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java

@@ -472,7 +472,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 	private void validEmInfo(EmInfoAddVo em_info) {
 		// 验证设备名称
 		List<EmInfoEntity> existName = this.list(
-				Wrappers.<EmInfoEntity>lambdaQuery().eq(EmInfoEntity::getName, em_info.getInfo().getName())
+				Wrappers.<EmInfoEntity>lambdaQuery().eq(EmInfoEntity::getName, em_info.getInfo().getName()).eq(EmInfoEntity::getDepartment, em_info.getInfo().getDepartment())
 		);
 		Assert.isTrue(CollectionUtil.isEmpty(existName),()-> {
 			throw new ServiceException("设备名称已存在");

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java

@@ -54,10 +54,16 @@ public class StatisticsServiceImpl extends ServiceImpl<StatisticsMapper, Statist
                 statistics = new Statistics();
                 statistics.setDateCalculated(sysLogStatisticsVo.getOperationTime());
                 statistics.setModuleNameNum(sysLogStatisticsVo.getModuleNameCount());
+                statistics.setTitle(sysLogStatisticsVo.getTitle());
+                statistics.setModuleName(sysLogStatisticsVo.getModuleName());
+                statistics.setPath(sysLogStatisticsVo.getPath());
                 statistics.setTitleNum(sysLogStatisticsVo.getTitleCount());
                 statistics.setPathNum(sysLogStatisticsVo.getPathCount());
                 statisticsService.save(statistics);
             } else {
+                statistics.setTitle(sysLogStatisticsVo.getTitle());
+                statistics.setModuleName(sysLogStatisticsVo.getModuleName());
+                statistics.setPath(sysLogStatisticsVo.getPath());
                 statistics.setModuleNameNum(sysLogStatisticsVo.getModuleNameCount());
                 statistics.setTitleNum(sysLogStatisticsVo.getTitleCount());
                 statistics.setPathNum(sysLogStatisticsVo.getPathCount());

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/vo/SysLogStatisticsVo.java

@@ -43,7 +43,7 @@ public class SysLogStatisticsVo {
     /**
      * 根据路径统计
      */
-    private Integer path;
+    private String path;
 
     /**
      * 根据路径统计

hzims-service/operational/pom.xml

@@ -14,6 +14,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <documents4j.version>1.0.3</documents4j.version>
+        <swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
     </properties>
 
     <dependencies>
@@ -214,6 +215,18 @@
             <groupId>com.hnac.hzinfo.data</groupId>
             <artifactId>hzinfo-data-sdk</artifactId>
         </dependency>
+
+
+
+        <!--swagger-bootstrap-ui-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>${swagger-bootstrap-ui.version}</version>
+        </dependency>
+
+
+
     </dependencies>
 
     <build>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/OperationApplication.java

@@ -48,7 +48,6 @@ public class OperationApplication extends SpringBootServletInitializer {
 	}
 
 
-
 	public static void main(String[] args) {
 		BladeApplication.run(OperationalConstants.APP_NAME, OperationApplication.class, args);
 	}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/dto/OperAccessStatisticsDTO.java

@@ -27,14 +27,15 @@ public class OperAccessStatisticsDTO extends OperAccessStatisticsEntity {
 	private List<Long> deptIds;
 
 	/**
-	 * 年月
+	 * 月份
 	 */
-	private YearMonth yearMonth;
+	@ApiModelProperty("月份")
-
+	private YearMonth yearmonth;
 
 	/**
 	 * 区域Id
 	 */
+	@ApiModelProperty("区域Id")
 	private String areaId;
 
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java

@@ -0,0 +1,60 @@
+package com.hnac.hzims.operational.config;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import com.google.common.base.Predicates;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/4/13 13:40
+ */
+@Configuration
+@EnableSwagger2
+public class Swagger2Config implements WebMvcConfigurer {
+
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/**")
+                .addResourceLocations("classpath:/static/");
+        registry.addResourceHandler("doc.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+
+
+    @Bean
+    public Docket webApiConfig(){
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("operationApplication")
+                .apiInfo(webApiInfo())
+                .select()
+                //只显示api路径下的页面
+                .paths(Predicates.and(PathSelectors.regex("/areaMonthlyDetails/.*")))
+                .build();
+
+    }
+
+    private ApiInfo webApiInfo() {
+        return new ApiInfoBuilder()
+                .title("网站-API文档")
+                .description("本文档描述了网站微服务接口定义")
+                .version("1.0")
+                .contact(new Contact("WL", "http://localhost:8501/", "55317332@qq.com"))
+                .build();
+    }
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/web/AreaMonthlyDetailsController.java

@@ -28,7 +28,9 @@ import com.hnac.hzims.ticket.areamonthly.vo.*;
 import com.hnac.hzinfo.inspect.areamonthly.vo.TaskListQuery;
 import com.hnac.hzinfo.inspect.areamonthly.vo.TaskVo;
 import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseEntity;
@@ -49,6 +51,7 @@ import java.util.List;
  * @Serial 1.0
  * @Date 2023/4/10 11:21
  */
+@Api(tags = "水电生成报告详情数据")
 @Slf4j
 @RequiredArgsConstructor
 @RestController
@@ -66,12 +69,16 @@ public class AreaMonthlyDetailsController {
     private final IOperAccessStatisticsService accessStatisticsService;
 
     /**
-     * 操作票  根据月份，区域 获取操作详情数据
+     * 操作票 根据月份，区域 获取操作详情数据
      *
      * @return
      */
+    @ApiOperation("操作票 根据月份，区域 获取操作详情数据")
     @GetMapping("/areaMonthlyWithOperation/{page}/{size}")
-    public R areaMonthlyWithOperation(@PathVariable("page") Long page, @PathVariable("size") Long size, StandardTicketWithAreaVo areaMonthly) {
+    public R areaMonthlyWithOperation(
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
+            StandardTicketWithAreaVo areaMonthly) {
         BladePage<StandardTicketVo> standardTicketInfoVoIPage = areaMonthlyDetailsService.areaMonthlyWithOperation(page, size, areaMonthly);
         return R.data(standardTicketInfoVoIPage);
     }
@@ -82,6 +89,7 @@ public class AreaMonthlyDetailsController {
      *
      * @return
      */
+    @ApiOperation("操作票  根据月份，区域 获取操作详情数据")
     @GetMapping("/areaMonthlyWithOperation/detail/{id}")
     public R areaMonthlyWithOperationDetail(@PathVariable("id") Long id) {
         StandardTicketInfoVO standardTicketInfoVoIPage = areaMonthlyDetailsService.areaMonthlyWithOperationDetail(id);
@@ -92,6 +100,7 @@ public class AreaMonthlyDetailsController {
     /**
      * 查询工作票评论
      */
+    @ApiOperation("查询工作票评论")
     @GetMapping("/areaMonthlyWithOperation/workTicketCommentList")
     public R<List<TicketInfoEvaluateVO>> workTicketCommentList(TicketInfoEvaluateEntity req) {
         List<TicketInfoEvaluateVO> ticketInfoEvaluateVOS = areaMonthlyDetailsService.workTicketCommentList(req);
@@ -102,6 +111,7 @@ public class AreaMonthlyDetailsController {
     /**
      * 保存评论信息
      */
+    @ApiOperation("保存评论信息")
     @PostMapping("/saveComment")
     public R saveComment(@RequestBody TicketInfoEvaluateDto req) {
         return R.data(areaMonthlyDetailsService.saveComment(req));
@@ -110,8 +120,12 @@ public class AreaMonthlyDetailsController {
     /**
      * 根据月份和区域查询工作票列表详情
      */
+    @ApiOperation("根据月份和区域查询工作票列表详情")
     @GetMapping("/workTicketListByMonthAndArea/{page}/{size}")
-    R<BladePage<StandardWorkVo>> workTicketListByMonthAndArea(@PathVariable Long page, @PathVariable Long size, @SpringQueryMap StandardTicketWithAreaVo areaMonthlyVo) {
+    R<BladePage<StandardWorkVo>> workTicketListByMonthAndArea(
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
+            @SpringQueryMap StandardTicketWithAreaVo areaMonthlyVo) {
         BladePage<StandardWorkVo> standardWorkVoIPage = areaMonthlyDetailsService.workTicketListByMonthAndArea(page, size, areaMonthlyVo);
         return R.data(standardWorkVoIPage);
     }
@@ -121,9 +135,12 @@ public class AreaMonthlyDetailsController {
      * 根据区域和月份分页查询日志维护列表
      */
     @ApiOperationSupport(order = 100)
-    @ApiOperation(value = "日志维护列表分页查询")
+    @ApiOperation(value = "根据区域和月份分页查询日志维护列表")
     @GetMapping("/queryLogMaintenancePageList/{page}/{size}")
-    public R<IPage<MaintenanceTaskVo>> queryLogMaintenancePageList(@PathVariable Long page, @PathVariable Long size, MaintenanceTaskWithAreaVo maintenanceTaskVo) {
+    public R<IPage<MaintenanceTaskVo>> queryLogMaintenancePageList(
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
+            MaintenanceTaskWithAreaVo maintenanceTaskVo) {
         Page<OperMaintenanceTaskEntity> pageParam = new Page<>(page, size);
         IPage<MaintenanceTaskVo> taskList = taskService.queryLogMaintenancePageList(pageParam, maintenanceTaskVo);
         return R.data(taskList);
@@ -135,7 +152,7 @@ public class AreaMonthlyDetailsController {
      */
     @GetMapping("/queryLogMaintenancePageList/detail/{id}")
     @ApiOperationSupport(order = 40)
-    @ApiOperation(value = "详情")
+    @ApiOperation(value = "根据区域和月份分页查询日志维护 根据id获取详情")
     public R<OperMaintenanceTaskEntity> detail(@PathVariable Long id) {
         return taskService.detail(id);
     }
@@ -145,7 +162,7 @@ public class AreaMonthlyDetailsController {
      * 根据区域和月份分页查询巡检任务
      */
     @ApiOperationSupport(order = 50)
-    @ApiOperation(value = "分页查询")
+    @ApiOperation(value = "根据区域和月份分页查询巡检任务")
     @GetMapping("/queryCheckTaskPageList")
     public R<BladePage<TaskVo>> queryCheckTaskPageList(TaskListQuery task, Query query) {
         BladePage<TaskVo> taskVoIPage = areaMonthlyDetailsService.queryCheckTaskPageList(task, query);
@@ -156,9 +173,9 @@ public class AreaMonthlyDetailsController {
     /**
      * 根据id查询巡检任务
      */
+    @ApiOperation(value = "根据id查询巡检任务")
     @GetMapping("/queryCheckTaskById/{id}")
     @ApiOperationSupport(order = 60)
-    @ApiOperation(value = "详情")
     public R<TaskEntity> queryCheckTaskById(@PathVariable Long id) {
         TaskEntity task = areaMonthlyDetailsService.queryCheckTaskById(id);
         return R.data(task);
@@ -169,11 +186,11 @@ public class AreaMonthlyDetailsController {
      * 根据区域和月份分页查询缺陷库
      */
     @ApiOperationSupport(order = 70)
-    @ApiOperation(value = "分页查询")
+    @ApiOperation(value = "根据区域和月份分页查询缺陷库")
     @GetMapping("/queryDefectPageList/{page}/{size}")
     public R<IPage<OperDefectVO>> queryDefectPageList(
-            @PathVariable Long page,
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
-            @PathVariable Long size,
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
             OperDefectEntity defect) {
         Page<OperDefectEntity> operDefectEntityPage = new Page<>(page, size);
         IPage<OperDefectEntity> pages = defectService.selectPage(operDefectEntityPage, defect);
@@ -187,7 +204,7 @@ public class AreaMonthlyDetailsController {
      */
     @GetMapping("queryDefectPageDetail/detail")
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "详情", notes = "传入defect")
+    @ApiOperation(value = "根据区域和月份分页查询缺陷库 详情", notes = "传入defect")
     public R<OperDefectVO> queryDefectPageDetail(OperDefectEntity defect) {
         return defectService.detail(defect);
     }
@@ -200,7 +217,8 @@ public class AreaMonthlyDetailsController {
     @ApiOperation(value = "根据区域和月份分页查询检修任务")
     @GetMapping("/queryReconditionPageList/{page}/{size}")
     public R<IPage<OperAccessStatisticsVO>> queryReconditionPageList(
-            @PathVariable Long page, @PathVariable Long size,
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
             OperAccessStatisticsDTO result) {
         Page<OperAccessStatisticsVO> dbPage = new Page<>(page, size);
         R<IPage<OperAccessStatisticsVO>> r = accessStatisticsService.list(result, dbPage);
@@ -226,8 +244,10 @@ public class AreaMonthlyDetailsController {
     @GetMapping("/queryProduceNumByAreaCode/{page}/{size}")
     @ApiOperationSupport(order = 90)
     @ApiOperation(value = "根据区域编号查询安全生产会议次数")
-    public R<BladePage<CheckMonthVo>> queryProduceNumByAreaCode(@PathVariable Long page, @PathVariable Long size,
+    public R<BladePage<CheckMonthVo>> queryProduceNumByAreaCode(
-                                                                CheckMonthEntity req) {
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
+            CheckMonthEntity req) {
         req.setItemName("现场每月1次安全生产会议");
         BladePage<CheckMonthVo> checkMonthVoBladePage = areaMonthlyDetailsService.queryProduceByAreaCode(page, size,
                 req);
@@ -240,7 +260,10 @@ public class AreaMonthlyDetailsController {
     @GetMapping("/querySkillByAreaCode/{page}/{size}")
     @ApiOperationSupport(order = 100)
     @ApiOperation(value = "根据区域编号查询技能培训")
-    public R<BladePage<CheckMonthVo>> querySkillByAreaCode(@PathVariable Long page, @PathVariable Long size, CheckMonthEntity req) {
+    public R<BladePage<CheckMonthVo>> querySkillByAreaCode(
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
+            CheckMonthEntity req) {
         req.setItemName("每月开展1次技能培训");
         BladePage<CheckMonthVo> checkMonthVoBladePage = areaMonthlyDetailsService.queryProduceByAreaCode(page, size,
                 req);
@@ -254,21 +277,23 @@ public class AreaMonthlyDetailsController {
     @GetMapping("/queryProduceByAreaCode/{page}/{size}")
     @ApiOperationSupport(order = 100)
     @ApiOperation(value = "根据区域编号查询技能培训")
-    public R<BladePage<CheckMonthVo>> queryProduceByAreaCode(@PathVariable Long page, @PathVariable Long size, CheckMonthEntity req) {
+    public R<BladePage<CheckMonthVo>> queryProduceByAreaCode(
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
+            CheckMonthEntity req) {
         BladePage<CheckMonthVo> checkMonthVoBladePage = areaMonthlyDetailsService.queryProduceByAreaCode(page, size,
                 req);
         return R.data(checkMonthVoBladePage);
     }
 
 
-
     /**
      * 根据区域编号查询 月度自查 技能培训 安全生产会议次数
      */
     @GetMapping("/queryProduceByAreaCodeDetail/detail/{id}")
     @ApiOperationSupport(order = 40)
-    @ApiOperation(value = "详情", notes = "传入id")
+    @ApiOperation(value = "根据区域编号查询 月度自查 技能培训 安全生产会议次数", notes = "传入id")
-    public R<CheckMonthVo> queryProduceByAreaCodeDetail(@PathVariable Long id){
+    public R<CheckMonthVo> queryProduceByAreaCodeDetail(@PathVariable Long id) {
         CheckMonthVo checkMonthVo = areaMonthlyDetailsService.queryProduceByAreaCodeDetail(id);
         return R.data(checkMonthVo);
     }
@@ -280,9 +305,10 @@ public class AreaMonthlyDetailsController {
     @GetMapping("/querySecurityAreaCode/{page}/{size}")
     @ApiOperationSupport(order = 100)
     @ApiOperation(value = "根据区域编号查询安全检查")
-    public R<BladePage<CheckCompanyVo>> querySecurityAreaCode(@PathVariable Long page,
+    public R<BladePage<CheckCompanyVo>> querySecurityAreaCode(
-                                                              @PathVariable Long size,
+            @ApiParam(name = "page", value = "当前页", required = true) @PathVariable("page") Long page,
-                                                              CheckCompanyEntity req) {
+            @ApiParam(name = "size", value = "每页记录数", required = true) @PathVariable("size") Long size,
+            CheckCompanyEntity req) {
         BladePage<CheckCompanyVo> checkMonthVoBladePage = areaMonthlyDetailsService.querySecurityAreaCode(page, size,
                 req);
         return R.data(checkMonthVoBladePage);
@@ -301,7 +327,6 @@ public class AreaMonthlyDetailsController {
     }
 
 
-
     /**
      * 根据区域编号查询设备试验
      */
@@ -309,11 +334,11 @@ public class AreaMonthlyDetailsController {
     @ApiOperationSupport(order = 100)
     @ApiOperation(value = "根据区域编号查询设备试验")
     public R<BladePage<SafeEquipmentTrialVO>> queryEquipmentAreaCode(
-            @PathVariable Long page,
+            @ApiParam(name = "page",value = "当前页",required = true) @PathVariable("page") Long page,
-            @PathVariable Long size,
+            @ApiParam(name = "size",value = "每页记录数",required = true) @PathVariable("size") Long size,
             SafeEquipmentTrialDTO safeEquipmentTrialDTO) {
         BladePage<SafeEquipmentTrialVO> checkMonthVoBladePage = areaMonthlyDetailsService.queryEquipmentAreaCode(page
-                ,size,safeEquipmentTrialDTO);
+                , size, safeEquipmentTrialDTO);
         return R.data(checkMonthVoBladePage);
     }
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java

@@ -141,6 +141,8 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
 			}
 			// 删除智能诊断站点
 			questionClient.deleteStationInfo(stationEntity.getCode());
+			//删除所属机构信息
+			deptClient.deleteDeptById(stationEntity.getRefDept());
 		}
 		return saveFlag;
 	}