监督检查: 检查项、调查项省平台获取

zh-baseversion-admin/src/main/java/com/zehong/web/controller/government/GovernmentSupervisionInfoController.java

@@ -94,5 +94,72 @@ public class GovernmentSupervisionInfoController {
     }
 
 
+    /**
+     * 获取检查范围
+     * @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
+     * @param pageIndex 页码
+     * @param pageSize 每页记录数，取值范围: 1~1000
+     * @return
+     */
+    @GetMapping(value = "/getScope")
+    public AjaxResult getScope(@RequestParam(value = "updateTime") String updateTime,@RequestParam(value = "pageIndex") Integer pageIndex,@RequestParam(value = "pageSize") Integer pageSize){
+        try {
+            Map<String,Object> map = new HashMap<>();
+            map.put("updateTime",updateTime);
+            map.put("pageIndex",pageIndex);
+            map.put("pageSize",pageSize);
+            JSONObject json = governmentSupervisionInfoService.getScope(map);
+            return AjaxResult.success(json);
+        } catch (Exception e) {
+            log.error("获取检查范围失败",e);
+            return AjaxResult.error("获取检查范围失败");
+        }
+    }
+
+    /**
+     * 获取检查项
+     * @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
+     * @param pageIndex 页码
+     * @param pageSize 每页记录数，取值范围: 1~1000
+     * @return
+     */
+    @GetMapping(value = "/getInspectList")
+    public AjaxResult getInspectList(@RequestParam(value = "updateTime") String updateTime,@RequestParam(value = "pageIndex") Integer pageIndex,@RequestParam(value = "pageSize") Integer pageSize){
+        try {
+            Map<String,Object> map = new HashMap<>();
+            map.put("updateTime",updateTime);
+            map.put("pageIndex",pageIndex);
+            map.put("pageSize",pageSize);
+            JSONObject json = governmentSupervisionInfoService.getInspectList(map);
+            return AjaxResult.success(json);
+        } catch (Exception e) {
+            log.error("获取检查项失败",e);
+            return AjaxResult.error("获取检查项失败");
+        }
+    }
+
+
+    /**
+     * 获取调查项
+     * @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
+     * @param pageIndex 页码
+     * @param pageSize 每页记录数，取值范围: 1~1000
+     * @return
+     */
+    @GetMapping(value = "/getSurveyList")
+    public AjaxResult getSurveyList(@RequestParam(value = "updateTime") String updateTime,@RequestParam(value = "pageIndex") Integer pageIndex,@RequestParam(value = "pageSize") Integer pageSize){
+        try {
+            Map<String,Object> map = new HashMap<>();
+            map.put("updateTime",updateTime);
+            map.put("pageIndex",pageIndex);
+            map.put("pageSize",pageSize);
+            JSONObject json = governmentSupervisionInfoService.getSurveyList(map);
+            return AjaxResult.success(json);
+        } catch (Exception e) {
+            log.error("获取调查项失败",e);
+            return AjaxResult.error("获取调查项失败");
+        }
+    }
+
 
 }

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TInsInsListInforVo.java

+package com.zehong.system.domain.vo;
+
+public class TInsInsListInforVo {
+
+    /**检查项任务编码*/
+    private String checkTaskCode;
+
+    /**主键 id*/
+    private Integer checkItemId;
+
+    /**检查项唯一编码*/
+    private String uniqueCode;
+
+    /**检查项名称*/
+    private String checkItemName;
+
+    /**检查对象分类*/
+    private String checkClassification;
+
+    /**检查方法*/
+    private String checkMethod;
+
+    /**检查内容*/
+    private String checkContent;
+
+    /**隐患级别*/
+    private String hazardLevel;
+
+    /**启用状态*/
+    private Integer enableState;
+
+    /**检查依据*/
+    private String checkBasis;
+
+    /**隐患分类分级标准*/
+    private Integer hazardTypeLevelId;
+
+    private String createBy;
+
+    private String createTime;
+
+    private String updateBy;
+
+    private String updateTime;
+
+    /**删除标记*/
+    private Integer deleteFlag;
+
+    public String getCheckTaskCode() {
+        return checkTaskCode;
+    }
+
+    public void setCheckTaskCode(String checkTaskCode) {
+        this.checkTaskCode = checkTaskCode;
+    }
+
+    public Integer getCheckItemId() {
+        return checkItemId;
+    }
+
+    public void setCheckItemId(Integer checkItemId) {
+        this.checkItemId = checkItemId;
+    }
+
+    public String getUniqueCode() {
+        return uniqueCode;
+    }
+
+    public void setUniqueCode(String uniqueCode) {
+        this.uniqueCode = uniqueCode;
+    }
+
+    public String getCheckItemName() {
+        return checkItemName;
+    }
+
+    public void setCheckItemName(String checkItemName) {
+        this.checkItemName = checkItemName;
+    }
+
+    public String getCheckClassification() {
+        return checkClassification;
+    }
+
+    public void setCheckClassification(String checkClassification) {
+        this.checkClassification = checkClassification;
+    }
+
+    public String getCheckMethod() {
+        return checkMethod;
+    }
+
+    public void setCheckMethod(String checkMethod) {
+        this.checkMethod = checkMethod;
+    }
+
+    public String getCheckContent() {
+        return checkContent;
+    }
+
+    public void setCheckContent(String checkContent) {
+        this.checkContent = checkContent;
+    }
+
+    public String getHazardLevel() {
+        return hazardLevel;
+    }
+
+    public void setHazardLevel(String hazardLevel) {
+        this.hazardLevel = hazardLevel;
+    }
+
+    public Integer getEnableState() {
+        return enableState;
+    }
+
+    public void setEnableState(Integer enableState) {
+        this.enableState = enableState;
+    }
+
+    public String getCheckBasis() {
+        return checkBasis;
+    }
+
+    public void setCheckBasis(String checkBasis) {
+        this.checkBasis = checkBasis;
+    }
+
+    public Integer getHazardTypeLevelId() {
+        return hazardTypeLevelId;
+    }
+
+    public void setHazardTypeLevelId(Integer hazardTypeLevelId) {
+        this.hazardTypeLevelId = hazardTypeLevelId;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TInsScopeInforVo.java

+package com.zehong.system.domain.vo;
+
+public class TInsScopeInforVo {
+
+    /**关联抽查任务表*/
+    private Integer hazardCheckTaskId;
+
+    /**对象分类*/
+    private String objectType;
+
+    /**检查表实例关联 id*/
+    private Integer hazardCheckTableRecordId;
+
+    /**抽查要求*/
+    private String spotCheckType;
+
+    private String spotCheck;
+
+    private String specialFlag;
+
+    /**此对象应检数据*/
+    private Integer lotCount;
+
+    /**抽查细类*/
+    private String subobjecttypeCheckTypeDesc;
+
+    /**删除标记*/
+    private Integer deleteFlag;
+
+    /**描述*/
+    private String remark;
+
+    /**创建时间*/
+    private String createTime;
+
+    /**创建人*/
+    private String createBy;
+
+    /**修改时间*/
+    private String updateTime;
+
+    /**修改人*/
+    private String modifyBy;
+
+    public Integer getHazardCheckTaskId() {
+        return hazardCheckTaskId;
+    }
+
+    public void setHazardCheckTaskId(Integer hazardCheckTaskId) {
+        this.hazardCheckTaskId = hazardCheckTaskId;
+    }
+
+    public String getObjectType() {
+        return objectType;
+    }
+
+    public void setObjectType(String objectType) {
+        this.objectType = objectType;
+    }
+
+    public Integer getHazardCheckTableRecordId() {
+        return hazardCheckTableRecordId;
+    }
+
+    public void setHazardCheckTableRecordId(Integer hazardCheckTableRecordId) {
+        this.hazardCheckTableRecordId = hazardCheckTableRecordId;
+    }
+
+    public String getSpotCheckType() {
+        return spotCheckType;
+    }
+
+    public void setSpotCheckType(String spotCheckType) {
+        this.spotCheckType = spotCheckType;
+    }
+
+    public String getSpotCheck() {
+        return spotCheck;
+    }
+
+    public void setSpotCheck(String spotCheck) {
+        this.spotCheck = spotCheck;
+    }
+
+    public String getSpecialFlag() {
+        return specialFlag;
+    }
+
+    public void setSpecialFlag(String specialFlag) {
+        this.specialFlag = specialFlag;
+    }
+
+    public Integer getLotCount() {
+        return lotCount;
+    }
+
+    public void setLotCount(Integer lotCount) {
+        this.lotCount = lotCount;
+    }
+
+    public String getSubobjecttypeCheckTypeDesc() {
+        return subobjecttypeCheckTypeDesc;
+    }
+
+    public void setSubobjecttypeCheckTypeDesc(String subobjecttypeCheckTypeDesc) {
+        this.subobjecttypeCheckTypeDesc = subobjecttypeCheckTypeDesc;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getModifyBy() {
+        return modifyBy;
+    }
+
+    public void setModifyBy(String modifyBy) {
+        this.modifyBy = modifyBy;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TInsSurListInforVo.java

+package com.zehong.system.domain.vo;
+
+public class TInsSurListInforVo {
+
+    /**关联的检查任务编码*/
+    private String checkTaskCode;
+
+    /**检查对象分类*/
+    private String typeCode;
+
+    /**调查内容*/
+    private String contents;
+
+    /**结果填写类型*/
+    private Integer resType;
+
+    /**结果填写选项*/
+    private String resOption;
+
+    /**顺序号*/
+    private Integer ord;
+
+    /**最后修改时间*/
+    private String lastUpdateTime;
+
+    public String getCheckTaskCode() {
+        return checkTaskCode;
+    }
+
+    public void setCheckTaskCode(String checkTaskCode) {
+        this.checkTaskCode = checkTaskCode;
+    }
+
+    public String getTypeCode() {
+        return typeCode;
+    }
+
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode;
+    }
+
+    public String getContents() {
+        return contents;
+    }
+
+    public void setContents(String contents) {
+        this.contents = contents;
+    }
+
+    public Integer getResType() {
+        return resType;
+    }
+
+    public void setResType(Integer resType) {
+        this.resType = resType;
+    }
+
+    public String getResOption() {
+        return resOption;
+    }
+
+    public void setResOption(String resOption) {
+        this.resOption = resOption;
+    }
+
+    public Integer getOrd() {
+        return ord;
+    }
+
+    public void setOrd(Integer ord) {
+        this.ord = ord;
+    }
+
+    public String getLastUpdateTime() {
+        return lastUpdateTime;
+    }
+
+    public void setLastUpdateTime(String lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TInsInsListInforMapper.java

@@ -58,4 +58,11 @@ public interface TInsInsListInforMapper
      * @return 结果
      */
     public int deleteTInsInsListInforByIds(Long[] fInsInsListInforIds);
+
+    /**
+     * 批量插入
+     * @param list 批量数据
+     * @return
+     */
+    int batchInsertTInsInsListInfor(List<TInsInsListInfor> list);
 }

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TInsScopeInforMapper.java

@@ -58,4 +58,11 @@ public interface TInsScopeInforMapper
      * @return 结果
      */
     public int deleteTInsScopeInforByIds(Long[] fScopeInforIds);
+
+    /**
+     * 批量插入
+     * @param list 批量数据
+     * @return
+     */
+    int batchInsertTInsScopeInfor(List<TInsScopeInfor> list);
 }

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TInsSurListInforMapper.java

@@ -58,4 +58,11 @@ public interface TInsSurListInforMapper
      * @return 结果
      */
     public int deleteTInsSurListInforByIds(Long[] fInsSurListInforIds);
+
+    /**
+     * 批量插入
+     * @param list 批量数据
+     * @return
+     */
+    int batchInsertTInsSurListInfor(List<TInsSurListInfor> list);
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/GovernmentSupervisionInfoService.java

@@ -34,4 +34,28 @@ public interface GovernmentSupervisionInfoService {
      */
     JSONObject getTask (Map<String,Object> map) throws Exception;
 
+    /**
+     * 获取检查范围
+     * @param map 入参
+     * @return
+     * @throws Exception
+     */
+    JSONObject getScope (Map<String,Object> map) throws Exception;
+
+    /**
+     * 获取检查项
+     * @param map 入参
+     * @return
+     * @throws Exception
+     */
+    JSONObject getInspectList (Map<String,Object> map) throws Exception;
+
+    /**
+     * 获取调查项
+     * @param map 入参
+     * @return
+     * @throws Exception
+     */
+    JSONObject getSurveyList (Map<String,Object> map) throws Exception;
+
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/GovernmentSupervisionInfoServiceImpl.java

@@ -4,15 +4,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zehong.common.utils.GovernmentDataCopyUtil;
 import com.zehong.common.utils.GovernmentDataUtil;
-import com.zehong.system.domain.FProBehInforBrowse;
-import com.zehong.system.domain.TInsTaskInfor;
-import com.zehong.system.domain.TProAppInforBrowse;
-import com.zehong.system.domain.vo.ProAppInforBrowseVo;
-import com.zehong.system.domain.vo.ProBehInfoBrowseVo;
-import com.zehong.system.domain.vo.TInsTaskInforVo;
-import com.zehong.system.mapper.FProBehInforBrowseMapper;
-import com.zehong.system.mapper.TInsTaskInforMapper;
-import com.zehong.system.mapper.TProAppInforBrowseMapper;
+import com.zehong.system.domain.*;
+import com.zehong.system.domain.vo.*;
+import com.zehong.system.mapper.*;
 import com.zehong.system.service.GovernmentSupervisionInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +39,15 @@ public class GovernmentSupervisionInfoServiceImpl implements GovernmentSupervisi
     @Resource
     private TInsTaskInforMapper tInsTaskInforMapper;
 
+    @Resource
+    private TInsScopeInforMapper tInsScopeInforMapper;
+
+    @Resource
+    private TInsInsListInforMapper tInsInsListInforMapper;
+
+    @Resource
+    private TInsSurListInforMapper insSurListInforMapper;
+
     /**
      * 获取行业专家档案
      * @param map 入参
@@ -118,8 +121,86 @@ public class GovernmentSupervisionInfoServiceImpl implements GovernmentSupervisi
             }
             tInsTaskInforMapper.batchInsertTInsTaskInfo(taskInforList);
         }
-        return null;
+        return json;
+    }
+
+
+    /**
+     * 获取检查范围
+     * @param map 入参
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject getScope(Map<String, Object> map) throws Exception {
+        JSONObject json = governmentDataUtil.getInfo("inspection/scope/information","READ",map);
+        log.info("获取检查范围结果=========" + json.toString());
+        if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
+            JSONArray data = json.getJSONArray("data");
+            List<TInsScopeInfor> scopeInforList = new ArrayList<>();
+            for(int i = 0; i < data.size(); i++){
+                TInsScopeInforVo insScopeInforVo = JSONObject.toJavaObject(data.getJSONObject(i), TInsScopeInforVo.class);
+                TInsScopeInfor tInsScopeInfor = new TInsScopeInfor();
+                GovernmentDataCopyUtil.copyToLocalData(insScopeInforVo,tInsScopeInfor);
+                scopeInforList.add(tInsScopeInfor);
+            }
+            tInsScopeInforMapper.batchInsertTInsScopeInfor(scopeInforList);
+        }
+        return json;
     }
 
+    /**
+     * 获取检查项
+     * @param map 入参
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject getInspectList(Map<String, Object> map) throws Exception {
+        JSONObject json = governmentDataUtil.getInfo("inspection/inspect/list/information","READ",map);
+        log.info("获取检查项结果=========" + json.toString());
+        if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
+            JSONArray data = json.getJSONArray("data");
+            List<TInsInsListInfor> insInsListInforList = new ArrayList<>();
+            for(int i = 0; i < data.size(); i++){
+                TInsInsListInforVo insInsListInforVo = JSONObject.toJavaObject(data.getJSONObject(i), TInsInsListInforVo.class);
+                TInsInsListInfor tInsInsListInfor = new TInsInsListInfor();
+                GovernmentDataCopyUtil.copyToLocalData(insInsListInforVo,tInsInsListInfor);
+                insInsListInforList.add(tInsInsListInfor);
+            }
+            tInsInsListInforMapper.batchInsertTInsInsListInfor(insInsListInforList);
+        }
+        return json;
+    }
+
+    /**
+     * 获取调查项
+     * @param map 入参
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject getSurveyList(Map<String, Object> map) throws Exception {
+        JSONObject json = governmentDataUtil.getInfo("inspection/survey/list/information","READ",map);
+        log.info("获取调查项'.结果=========" + json.toString());
+        if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
+            JSONArray data = json.getJSONArray("data");
+            List<TInsSurListInfor> insSurListInforList = new ArrayList<>();
+            for(int i = 0; i < data.size(); i++){
+                TInsSurListInforVo insSurListInforVo = JSONObject.toJavaObject(data.getJSONObject(i), TInsSurListInforVo.class);
+                TInsSurListInfor insSurListInfor = new TInsSurListInfor();
+                GovernmentDataCopyUtil.copyToLocalData(insSurListInforVo,insSurListInfor);
+                insSurListInforList.add(insSurListInfor);
+            }
+            insSurListInforMapper.batchInsertTInsSurListInfor(insSurListInforList);
+        }
+        return json;
+    }
+
+
+
 
 }

zh-baseversion-system/src/main/resources/mapper/system/TInsInsListInforMapper.xml

@@ -131,4 +131,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{fInsInsListInforId}
         </foreach>
     </delete>
+
+
+    <insert id="batchInsertTInsInsListInfor" parameterType="TInsInsListInfor" useGeneratedKeys="true" keyProperty="fInsInsListInforId">
+        insert into t_ins_ins_list_infor(
+            f_check_task_code,
+            f_unique_code,
+            f_check_time_name,
+            f_check_classification,
+            f_check_method,f_check_count,
+            f_hazard_level,
+            f_enable_state,
+            f_check_basis,
+            f_hazard_type_level_id,
+            f_create_by,
+            f_create_time,
+            f_update_by,
+            f_update_time,
+            f_delete_flag
+        )VALUES
+        <foreach collection="list" separator="," item="item">
+            (
+                #{item.fCheckTaskCode},
+                #{item.fUniqueCode},
+                #{item.fCheckTimeName},
+                #{item.fCheckClassification},
+                #{item.fCheckMethod},
+                #{item.fCheckCount},
+                #{item.fHazardLevel},
+                #{item.fEnableState},
+                #{item.fCheckBasis},
+                #{item.fHazardTypeLevelId},
+                #{item.fCreateBy},
+                #{item.fCreateTime},
+                #{item.fUpdateBy},
+                #{item.fUpdateTime},
+                #{item.fDeleteFlag}
+            )
+        </foreach>
+    </insert>
 </mapper>
\ No newline at end of file

zh-baseversion-system/src/main/resources/mapper/system/TInsScopeInforMapper.xml

@@ -127,4 +127,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{fScopeInforId}
         </foreach>
     </delete>
+
+
+    <insert id="batchInsertTInsScopeInfor" parameterType="TInsScopeInfor" useGeneratedKeys="true" keyProperty="fScopeInforId">
+        insert into t_ins_scope_infor(
+            f_hazard_check_task_id,
+            f_object_type,
+            f_hazard_check_table_record_id,
+            f_spot_check_type,
+            f_spot_check,
+            f_special_flag,
+            f_lot_count,
+            f_subobjecttype_check_type_desc,
+            f_delete_flag,
+            f_remark,
+            f_create_time,
+            f_create_by,
+            f_update_time,
+            f_modify_by
+        )VALUES
+        <foreach collection="list" separator="," item="item">
+            (
+                #{item.fHazardCheckTaskId},
+                #{item.fObjectType},
+                #{item.fHazardCheckTableRecordId},
+                #{item.fSpotCheckType},
+                #{item.fSpotCheck},
+                #{item.fSpecialFlag},
+                #{item.fLotCount},
+                #{item.fSubobjecttypeCheckTypeDesc},
+                #{item.fDeleteFlag},
+                #{item.fRemark},
+                #{item.fCreateTime},
+                #{item.fCreateBy},
+                #{item.fUpdateTime},
+                #{item.fModifyBy}
+            )
+        </foreach>
+    </insert>
 </mapper>
\ No newline at end of file

zh-baseversion-system/src/main/resources/mapper/system/TInsSurListInforMapper.xml

@@ -79,4 +79,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{fInsSurListInforId}
         </foreach>
     </delete>
+
+    <insert id="batchInsertTInsSurListInfor" parameterType="TInsSurListInfor" useGeneratedKeys="true" keyProperty="fInsSurListInforId">
+        insert into t_ins_sur_list_infor(
+            f_check_task_code,
+            f_type_code,
+            f_contents,
+            f_res_type,
+            f_res_option,
+            ord,
+            f_last_update_time
+        )VALUES
+        <foreach collection="list" separator="," item="item">
+            (
+                #{item.fCheckTaskCode},
+                #{item.fTypeCode},
+                #{item.fContents},
+                #{item.fResType},
+                #{item.fResOption},
+                #{item.ord},
+                #{item.fLastUpdateTime}
+            )
+        </foreach>
+    </insert>
 </mapper>
\ No newline at end of file