点位管理增加按区域查询

project_data/sql/0.0.2/soc/soc.sql

@@ -1115,6 +1115,15 @@ END IF;
 			CHANGE COLUMN `plan_id` `parent_plan_id` bigint NULL DEFAULT NULL COMMENT '父计划id，没有就与plan_id一致' AFTER `ymd_minute`,
 			ADD COLUMN `plan_id` bigint NULL COMMENT '生成任务的计划id' AFTER `parent_plan_id`;
     END IF;
+	
+	-- 履职内容表增加NFC点位
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption_rule_point' AND COLUMN_NAME = 'check_id' ) THEN
+        ALTER TABLE `core_resumption_rule_point` 
+			MODIFY COLUMN `area_id` bigint NULL COMMENT '履职区域,区域表id' AFTER `name`,
+			ADD COLUMN `check_id` bigint NULL COMMENT 'NFC点位id' AFTER `area_id`;
+    END IF;
+	
 
 
 	ALTER TABLE `core_protection` MODIFY COLUMN `device_id` BIGINT NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRulePoint.java

@@ -45,6 +45,10 @@ public class AppRulePoint extends BaseEntity {
     @TableField("area_id")
     private Long areaId;
 
+    @ApiModelProperty(value = "检查区域,区域表id")
+    @TableField("check_id")
+    private Long checkId;
+
     @TableField("business_type")
     @ApiModelProperty(value = "该要点关联的业务类型")
     private String businessType;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rulePoint/AppRulePointDetailDto.java

@@ -16,12 +16,6 @@ public class AppRulePointDetailDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-//    @ApiModelProperty(value = "规范id")
-//    private Long ruleId;
-
-//    @ApiModelProperty(value = "检查要点编号")
-//    private int pointNum;
-
     @ApiModelProperty(value = "检查要点名称")
     private String name;
 
@@ -32,42 +26,16 @@ public class AppRulePointDetailDto {
     @ApiModelProperty(value = "检查区域名称")
     private String areaName;
 
-//    @ApiModelProperty(value = "安防类型,字典表value")
-//    private Integer safeType;
-//
-//    @ApiModelProperty(value = "安防类型名称")
-//    private String safeTypeName;
-//
-//    @ApiModelProperty(value = "整改期限,天数")
-//    private int reformDay;
-//
-//    @ApiModelProperty(value = "检查方法,字典表value")
-//    private Integer inspection;
-//
-//    @ApiModelProperty(value = "检查方法名称")
-//    private String inspectionName;
-//
-//    @ApiModelProperty(value = "数据类型,数据类型表id")
-//    private Long dataType;
-//
-//    @ApiModelProperty(value = "数据类型,数据类型表id")
-//    private String dataTypeName;
-//
-//    @ApiModelProperty(value = "时间类型,0无，1时分")
-//    private Integer timeType;
+    @ApiModelProperty(value = "NFC点位id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long checkId;
+
+    @ApiModelProperty(value = "NFC点位名称")
+    private String checkName;
 
     @ApiModelProperty(value = "备注")
     private String remark;
 
-//    @ApiModelProperty(value = "风险等级code")
-//    private Long degreeRisk;
-//
-//    @ApiModelProperty(value = "风险等级名称")
-//    private String degreeRiskName;
-
-    /*@ApiModelProperty(value = "sys_area_check 主键id")
-    private Long nfcBindId;*/
-
     @ApiModelProperty(value = "要点关联的业务类型")
     private String businessType;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rulePoint/AppRulePointDto.java

@@ -13,50 +13,21 @@ public class AppRulePointDto {
     @ApiModelProperty(value = "检查点id")
     private Long id;
 
-//    @ApiModelProperty(value = "规范id")
-//    private Long ruleId;
-
     @ApiModelProperty(value = "检查项id")
     private Long itemId;
 
-//    @ApiModelProperty(value = "检查要点编号")
-//    private int pointNum;
-
     @ApiModelProperty(value = "检查要点名称")
     private String name;
 
     @ApiModelProperty(value = "检查区域,区域表id")
     private Long areaId;
 
-//    @ApiModelProperty(value = "安防类型,字典表id")
-//    private Integer safeType;
-//
-//    @ApiModelProperty(value = "整改期限,天数")
-//    private int reformDay;
-//
-//    @ApiModelProperty(value = "检查方法,字典表id")
-//    private Integer inspection;
-//
-//    @ApiModelProperty(value = "数据类型,数据类型表id")
-//    private Long dataType;
-//
-//    @ApiModelProperty(value = "时间类型,0无，1时分")
-//    private Integer timeType;
+    @ApiModelProperty(value = "检查区域,区域表id")
+    private Long checkId;
 
     @ApiModelProperty(value = "备注")
     private String remark;
 
-//    @NotNull(message = "规则类型不能为空")
-//    @ApiModelProperty("规范类型id")
-//    private Long ruleTypeId;
-
-//    @ApiModelProperty("风险等级")
-//    private Long degreeRisk;
-
-    /*@ApiModelProperty(value = "nfc采集点id")
-    private Long nfcBindId;*/
-
     @ApiModelProperty(value = "要点关联的业务类型")
     private String businessType;
-
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rulePoint/AppRulePointInfoDto.java

@@ -15,9 +15,6 @@ public class AppRulePointInfoDto {
     @ApiModelProperty(value = "检查项id")
     private Long itemId;
 
-//    @ApiModelProperty(value = "检查项编号")
-//    private Integer itemNum;
-
     @ApiModelProperty(value = "检查项内容")
     private String itemName;
 
@@ -27,22 +24,19 @@ public class AppRulePointInfoDto {
     @ApiModelProperty(value = "检查点id")
     private Long id;
 
-//    @ApiModelProperty(value = "检查要点编号")
-//    private int pointNum;
-
-//    @ApiModelProperty(value = "安防类型,字典表value")
-//    private Integer safeType;
-//
-//    @ApiModelProperty(value = "安防类型名称")
-//    private String safeTypeText;
-
     @ApiModelProperty(value = "检查区域,区域表id")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long areaId;
 
     @ApiModelProperty(value = "检查区域名称")
     private String areaName;
 
+    @ApiModelProperty(value = "NFC点位id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long checkId;
+
+    @ApiModelProperty(value = "NFC点位名称")
+    private String checkName;
+
     @ApiModelProperty(value = "采集点名称")
     private String nfcName;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appRuleItem/AppRulePointSelectVo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 
 /**
+ * 计划选择履职内容时显示的内容
  * @author jingyuanchao
  * @date 2022/6/1 9:40
  */
@@ -42,4 +43,12 @@ public class AppRulePointSelectVo {
     private  Long areaId;
 
     private  String areaName;
+
+
+    @ApiModelProperty(value = "NFC点位id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long checkId;
+
+    @ApiModelProperty(value = "NFC点位名称")
+    private String checkName;
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaCheckController.java

@@ -123,4 +123,18 @@ public class SysAreaCheckController extends BaseController {
         ajax.put(AjaxResult.DATA_TAG, sysAreaChecks);
         return ajax;
     }
+
+    /**
+     *按机构类型获取所有点位
+     */
+    @ApiOperation(value = "按机构类型获取所有点位")
+    @GetMapping("/orgType/{orgType}")
+    public AjaxResult listByOrgType(@PathVariable Integer orgType) {
+//        SysArea condition = new SysArea();
+//        condition.setOrgType(orgType.toString());
+//        condition.setPageNum(1L);
+//        condition.setPageSize(9999L);
+//        TableDataInfo table= sysAreaCheckService.selectPage(condition);
+        return success();
+    }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaController.java

@@ -106,7 +106,7 @@ public class SysAreaController extends BaseController {
     }
 
     /**
-     * 删除【请填写功能名称】
+     *按机构类型获取所有区域
      */
     @ApiOperation(value = "按机构类型获取所有区域")
 //    @RequiresPermissions("system:area:list