Skip to content

Z
zh-baseversion-project
Commit 8730d2a3 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

抽查隐患、隐患分类、调研结果、市行政区

parent 39728e00
Hide whitespace changes
Inline Side-by-side
Showing with 1494 additions and 21 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/api/TokenController.java
View file @ 8730d2a3
package com.zehong.web.controller.api;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.utils.GovernmentDataCopyUtil;
import com.zehong.system.domain.FProBehInforBrowse;
import com.zehong.system.domain.TProAppInforBrowse;
import com.zehong.system.domain.vo.ProAppInforBrowseVo;
import com.zehong.system.domain.vo.ProBehInfoBrowseVo;
import com.zehong.system.service.IFProBehInforBrowseService;
import com.zehong.system.service.ITProAppInforBrowseService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
......
zh-baseversion-admin/src/main/java/com/zehong/web/controller/area/TCityLevelRegionController.java 0 → 100644
View file @ 8730d2a3
package com.zehong.web.controller.area;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TCityLevelRegion;
import com.zehong.system.service.ITCityLevelRegionService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 市级行政区Controller
*
* @author zehong
* @date 2024-06-06
*/
@RestController
@RequestMapping("/area/city")
public class TCityLevelRegionController extends BaseController
{
@Autowired
private ITCityLevelRegionService tCityLevelRegionService;
/**
* 查询市级行政区列表
*/
@GetMapping("/list")
public TableDataInfo list(TCityLevelRegion tCityLevelRegion)
{
startPage();
List<TCityLevelRegion> list = tCityLevelRegionService.selectTCityLevelRegionList(tCityLevelRegion);
return getDataTable(list);
}
/**
* 导出市级行政区列表
*/
@Log(title = "市级行政区", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TCityLevelRegion tCityLevelRegion)
{
List<TCityLevelRegion> list = tCityLevelRegionService.selectTCityLevelRegionList(tCityLevelRegion);
ExcelUtil<TCityLevelRegion> util = new ExcelUtil<TCityLevelRegion>(TCityLevelRegion.class);
return util.exportExcel(list, "市级行政区数据");
}
/**
* 获取市级行政区详细信息
*/
@GetMapping(value = "/{fId}")
public AjaxResult getInfo(@PathVariable("fId") Long fId)
{
return AjaxResult.success(tCityLevelRegionService.selectTCityLevelRegionById(fId));
}
/**
* 新增市级行政区
*/
@Log(title = "市级行政区", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TCityLevelRegion tCityLevelRegion)
{
return toAjax(tCityLevelRegionService.insertTCityLevelRegion(tCityLevelRegion));
}
/**
* 修改市级行政区
*/
@Log(title = "市级行政区", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TCityLevelRegion tCityLevelRegion)
{
return toAjax(tCityLevelRegionService.updateTCityLevelRegion(tCityLevelRegion));
}
/**
* 删除市级行政区
*/
@Log(title = "市级行政区", businessType = BusinessType.DELETE)
@DeleteMapping("/{fIds}")
public AjaxResult remove(@PathVariable Long[] fIds)
{
return toAjax(tCityLevelRegionService.deleteTCityLevelRegionByIds(fIds));
}
}
zh-baseversion-admin/src/main/java/com/zehong/web/controller/government/GovernmentSupervisionInfoController.java
View file @ 8730d2a3
......@@ -26,6 +26,29 @@ public class GovernmentSupervisionInfoController {
@Autowired
private GovernmentSupervisionInfoService governmentSupervisionInfoService;
/**
* 获取市级行政区
* @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
* @param pageIndex 页码
* @param pageSize 每页记录数，取值范围: 1~1000
* @return
*/
@GetMapping(value = "/getCity")
public AjaxResult getCity(@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.getCity(map);
return AjaxResult.success(json);
} catch (Exception e) {
log.error("获取市级行政区失败",e);
return AjaxResult.error("获取市级行政区失败");
}
}
/**
* 获取行业专家档案
* @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
......@@ -162,4 +185,49 @@ public class GovernmentSupervisionInfoController {
}
/**
* 获取抽查隐患
* @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
* @param pageIndex 页码
* @param pageSize 每页记录数，取值范围: 1~1000
* @return
*/
@GetMapping(value = "/getSpotHazard")
public AjaxResult getSpotHazard (@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.getSpotHazard(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 = "/getStandard")
public AjaxResult getStandard (@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.getStandard(map);
return AjaxResult.success(json);
} catch (Exception e) {
log.error("获取隐患分类分级标准失败",e);
return AjaxResult.error("获取隐患分类分级标准失败");
}
}
}
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsSpotRecInforController.java
View file @ 8730d2a3
......@@ -93,4 +93,19 @@ public class TInsSpotRecInforController extends BaseController
{
return toAjax(tInsSpotRecInforService.deleteTInsSpotRecInforByIds(fInsSpotRecInforIds));
}
/**
* 上传调查结果
* @param fInsSpotRecInforId 调查结果id
* @return
*/
@GetMapping("/reportSpotRecInfo")
public AjaxResult reportSpotRecInfo(Long fInsSpotRecInforId){
try{
return toAjax(tInsSpotRecInforService.reportSpotRecInfo(fInsSpotRecInforId));
}catch (Exception e){
logger.error("上传调查结果接口异常=====",e);
return AjaxResult.error("上传调查结果接口异常");
}
}
}
zh-baseversion-system/src/main/java/com/zehong/system/domain/TCityLevelRegion.java 0 → 100644
View file @ 8730d2a3
package com.zehong.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 市级行政区对象 t_city_level_region
*
* @author zehong
* @date 2024-06-06
*/
public class TCityLevelRegion extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long fId;
/** 市行政区划编码 */
@Excel(name = "市行政区划编码")
private String fCityCode;
/** 市名称 */
@Excel(name = "市名称")
private String fName;
/** 配列序号 */
@Excel(name = "配列序号")
private Long fSeq;
public void setfId(Long fId)
{
this.fId = fId;
}
public Long getfId()
{
return fId;
}
public void setfCityCode(String fCityCode)
{
this.fCityCode = fCityCode;
}
public String getfCityCode()
{
return fCityCode;
}
public void setfName(String fName)
{
this.fName = fName;
}
public String getfName()
{
return fName;
}
public void setfSeq(Long fSeq)
{
this.fSeq = fSeq;
}
public Long getfSeq()
{
return fSeq;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("fId", getfId())
.append("fCityCode", getfCityCode())
.append("fName", getfName())
.append("fSeq", getfSeq())
.toString();
}
}
zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TCityLevelRegionVo.java 0 → 100644
View file @ 8730d2a3
package com.zehong.system.domain.vo;
public class TCityLevelRegionVo {
/** 市级行政区 ID*/
private Long id;
/** 市行政区划编码*/
private String cityCode;
/** 市名称*/
private String name;
/** 排列顺序号*/
private String seq;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getCityCode() {
return cityCode;
}
public void setCityCode(String cityCode) {
this.cityCode = cityCode;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSeq() {
return seq;
}
public void setSeq(String seq) {
this.seq = seq;
}
}
zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TInsSpotHazardRefVo.java 0 → 100644
View file @ 8730d2a3
package com.zehong.system.domain.vo;
public class TInsSpotHazardRefVo {
/** 隐患唯一编码*/
private String hazardUniqueCode;
/** 隐患在市级平台系统中的自有编号*/
private String hazardOutUniqueCode;
/** 涉及供气企业编码*/
private String involveEnterpriseCode;
/** 对象分类*/
private String objType;
/** 对象编码*/
private String objCode;
/** 对象所在行政区,县级行政区 ID*/
private String objBelongRegionId;
/** 监督检查时间*/
private String checkTime;
/** 隐患分类分级编码*/
private String hazardTypeLevelId;
/** 隐患分类分级*/
private String hazardDesc;
/** 隐患整改前照片*/
private String beforePicture;
private String isEnforcement;
/** 备注*/
private String remark;
/** 最后修改时间*/
private String lastTime;
public String getHazardUniqueCode() {
return hazardUniqueCode;
}
public void setHazardUniqueCode(String hazardUniqueCode) {
this.hazardUniqueCode = hazardUniqueCode;
}
public String getHazardOutUniqueCode() {
return hazardOutUniqueCode;
}
public void setHazardOutUniqueCode(String hazardOutUniqueCode) {
this.hazardOutUniqueCode = hazardOutUniqueCode;
}
public String getInvolveEnterpriseCode() {
return involveEnterpriseCode;
}
public void setInvolveEnterpriseCode(String involveEnterpriseCode) {
this.involveEnterpriseCode = involveEnterpriseCode;
}
public String getObjType() {
return objType;
}
public void setObjType(String objType) {
this.objType = objType;
}
public String getObjCode() {
return objCode;
}
public void setObjCode(String objCode) {
this.objCode = objCode;
}
public String getObjBelongRegionId() {
return objBelongRegionId;
}
public void setObjBelongRegionId(String objBelongRegionId) {
this.objBelongRegionId = objBelongRegionId;
}
public String getCheckTime() {
return checkTime;
}
public void setCheckTime(String checkTime) {
this.checkTime = checkTime;
}
public String getHazardTypeLevelId() {
return hazardTypeLevelId;
}
public void setHazardTypeLevelId(String hazardTypeLevelId) {
this.hazardTypeLevelId = hazardTypeLevelId;
}
public String getHazardDesc() {
return hazardDesc;
}
public void setHazardDesc(String hazardDesc) {
this.hazardDesc = hazardDesc;
}
public String getBeforePicture() {
return beforePicture;
}
public void setBeforePicture(String beforePicture) {
this.beforePicture = beforePicture;
}
public String getIsEnforcement() {
return isEnforcement;
}
public void setIsEnforcement(String isEnforcement) {
this.isEnforcement = isEnforcement;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getLastTime() {
return lastTime;
}
public void setLastTime(String lastTime) {
this.lastTime = lastTime;
}
}
zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TInsSpotRecInforVo.java 0 → 100644
View file @ 8730d2a3
package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
public class TInsSpotRecInforVo {
/** 检查记录编码*/
private String checkCode;
/** 调研项目名称*/
private String name;
/** 调研内容*/
private String content;
/** 调研方法*/
private String method;
/** 调研结果*/
private String result;
/** 更新时间*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
public String getCheckCode() {
return checkCode;
}
public void setCheckCode(String checkCode) {
this.checkCode = checkCode;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getMethod() {
return method;
}
public void setMethod(String method) {
this.method = method;
}
public String getResult() {
return result;
}
public void setResult(String result) {
this.result = result;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TInsStaInforVo.java 0 → 100644
View file @ 8730d2a3
package com.zehong.system.domain.vo;
public class TInsStaInforVo {
/** 隐患名称*/
private String hazardName;
/** 隐患编码*/
private String hazardCode;
/** 隐患描述*/
private String hazardDescribe;
/** 对象分类*/
private String objectType;
private String hazardCategory;
/** 隐患环节*/
private String hazardLink;
/** 隐患等级*/
private String hazardLevel;
/** 隐患定义*/
private String hazardDefinitionSourceCode;
/** 整改责任归属*/
private String ownerResponse;
/** 主管部门关联*/
private String administrativeSysOrganizationId;
/** 主管部门名称*/
private String administrativeDepartmentName;
/** 是否强制执法*/
private String isEnforcement;
/** 执法部门*/
private String enforcementSysOrganizationId;
/** 执法部门名称冗余*/
private String enforcementDepartmentName;
/** 整改监督部门*/
private String supervisionSysOrganizationId;
/** 整改部门名称*/
private String supervisionDepartmentName;
/** 整改要求*/
private String rectRequire;
/** 整改期限*/
private String rectDeadline;
/** 隐患排查依据*/
private String hazardCheckBasis;
/** 检查项*/
private String checkItemId;
/** 检查部门*/
private String checkDept;
/** 检查方法*/
private String checkMethod;
/** 执法参考依据*/
private String enforcementAccording;
private String createBy;
private String createTime;
private String updateBy;
private String updateTime;
private String deleteFlag;
public String getHazardName() {
return hazardName;
}
public void setHazardName(String hazardName) {
this.hazardName = hazardName;
}
public String getHazardCode() {
return hazardCode;
}
public void setHazardCode(String hazardCode) {
this.hazardCode = hazardCode;
}
public String getHazardDescribe() {
return hazardDescribe;
}
public void setHazardDescribe(String hazardDescribe) {
this.hazardDescribe = hazardDescribe;
}
public String getObjectType() {
return objectType;
}
public void setObjectType(String objectType) {
this.objectType = objectType;
}
public String getHazardCategory() {
return hazardCategory;
}
public void setHazardCategory(String hazardCategory) {
this.hazardCategory = hazardCategory;
}
public String getHazardLink() {
return hazardLink;
}
public void setHazardLink(String hazardLink) {
this.hazardLink = hazardLink;
}
public String getHazardLevel() {
return hazardLevel;
}
public void setHazardLevel(String hazardLevel) {
this.hazardLevel = hazardLevel;
}
public String getHazardDefinitionSourceCode() {
return hazardDefinitionSourceCode;
}
public void setHazardDefinitionSourceCode(String hazardDefinitionSourceCode) {
this.hazardDefinitionSourceCode = hazardDefinitionSourceCode;
}
public String getOwnerResponse() {
return ownerResponse;
}
public void setOwnerResponse(String ownerResponse) {
this.ownerResponse = ownerResponse;
}
public String getAdministrativeSysOrganizationId() {
return administrativeSysOrganizationId;
}
public void setAdministrativeSysOrganizationId(String administrativeSysOrganizationId) {
this.administrativeSysOrganizationId = administrativeSysOrganizationId;
}
public String getAdministrativeDepartmentName() {
return administrativeDepartmentName;
}
public void setAdministrativeDepartmentName(String administrativeDepartmentName) {
this.administrativeDepartmentName = administrativeDepartmentName;
}
public String getIsEnforcement() {
return isEnforcement;
}
public void setIsEnforcement(String isEnforcement) {
this.isEnforcement = isEnforcement;
}
public String getEnforcementSysOrganizationId() {
return enforcementSysOrganizationId;
}
public void setEnforcementSysOrganizationId(String enforcementSysOrganizationId) {
this.enforcementSysOrganizationId = enforcementSysOrganizationId;
}
public String getEnforcementDepartmentName() {
return enforcementDepartmentName;
}
public void setEnforcementDepartmentName(String enforcementDepartmentName) {
this.enforcementDepartmentName = enforcementDepartmentName;
}
public String getSupervisionSysOrganizationId() {
return supervisionSysOrganizationId;
}
public void setSupervisionSysOrganizationId(String supervisionSysOrganizationId) {
this.supervisionSysOrganizationId = supervisionSysOrganizationId;
}
public String getSupervisionDepartmentName() {
return supervisionDepartmentName;
}
public void setSupervisionDepartmentName(String supervisionDepartmentName) {
this.supervisionDepartmentName = supervisionDepartmentName;
}
public String getRectRequire() {
return rectRequire;
}
public void setRectRequire(String rectRequire) {
this.rectRequire = rectRequire;
}
public String getRectDeadline() {
return rectDeadline;
}
public void setRectDeadline(String rectDeadline) {
this.rectDeadline = rectDeadline;
}
public String getHazardCheckBasis() {
return hazardCheckBasis;
}
public void setHazardCheckBasis(String hazardCheckBasis) {
this.hazardCheckBasis = hazardCheckBasis;
}
public String getCheckItemId() {
return checkItemId;
}
public void setCheckItemId(String checkItemId) {
this.checkItemId = checkItemId;
}
public String getCheckDept() {
return checkDept;
}
public void setCheckDept(String checkDept) {
this.checkDept = checkDept;
}
public String getCheckMethod() {
return checkMethod;
}
public void setCheckMethod(String checkMethod) {
this.checkMethod = checkMethod;
}
public String getEnforcementAccording() {
return enforcementAccording;
}
public void setEnforcementAccording(String enforcementAccording) {
this.enforcementAccording = enforcementAccording;
}
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 String getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag;
}
}
zh-baseversion-system/src/main/java/com/zehong/system/mapper/TCityLevelRegionMapper.java 0 → 100644
View file @ 8730d2a3
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TCityLevelRegion;
/**
* 市级行政区Mapper接口
*
* @author zehong
* @date 2024-06-06
*/
public interface TCityLevelRegionMapper
{
/**
* 查询市级行政区
*
* @param fId 市级行政区ID
* @return 市级行政区
*/
public TCityLevelRegion selectTCityLevelRegionById(Long fId);
/**
* 查询市级行政区列表
*
* @param tCityLevelRegion 市级行政区
* @return 市级行政区集合
*/
public List<TCityLevelRegion> selectTCityLevelRegionList(TCityLevelRegion tCityLevelRegion);
/**
* 新增市级行政区
*
* @param tCityLevelRegion 市级行政区
* @return 结果
*/
public int insertTCityLevelRegion(TCityLevelRegion tCityLevelRegion);
/**
* 修改市级行政区
*
* @param tCityLevelRegion 市级行政区
* @return 结果
*/
public int updateTCityLevelRegion(TCityLevelRegion tCityLevelRegion);
/**
* 删除市级行政区
*
* @param fId 市级行政区ID
* @return 结果
*/
public int deleteTCityLevelRegionById(Long fId);
/**
* 批量删除市级行政区
*
* @param fIds 需要删除的数据ID
* @return 结果
*/
public int deleteTCityLevelRegionByIds(Long[] fIds);
/**
* 批量插入
* @param list 批量数据
* @return
*/
int batchInsertTCityLevelRegion(List<TCityLevelRegion> list);
}
zh-baseversion-system/src/main/java/com/zehong/system/mapper/TInsSpotHazardRefMapper.java
View file @ 8730d2a3
......@@ -58,4 +58,12 @@ public interface TInsSpotHazardRefMapper
* @return 结果
*/
public int deleteTInsSpotHazardRefByIds(Long[] fInsSpotHazardRefIds);
/**
* 批量插入
* @param list 批量数据
* @return
*/
int batchInsertTInsSpotHazardRef(List<TInsSpotHazardRef> list);
}
zh-baseversion-system/src/main/java/com/zehong/system/mapper/TInsStaInforMapper.java
View file @ 8730d2a3
......@@ -58,4 +58,11 @@ public interface TInsStaInforMapper
* @return 结果
*/
public int deleteTInsStaInforByIds(Long[] fInsStaInforIds);
/**
* 批量插入
* @param list 批量数据
* @return
*/
int batchInsertTInsStaInfor(List<TInsStaInfor> list);
}
zh-baseversion-system/src/main/java/com/zehong/system/service/GovernmentSupervisionInfoService.java
View file @ 8730d2a3
......@@ -10,6 +10,14 @@ import java.util.Map;
*/
public interface GovernmentSupervisionInfoService {
/**
* 获取市级行政区
* @param map 入参
* @return
* @throws Exception
*/
JSONObject getCity(Map<String, Object> map) throws Exception;
/**
* 获取行业专家档案
* @param map 入参
......@@ -58,4 +66,21 @@ public interface GovernmentSupervisionInfoService {
*/
JSONObject getSurveyList (Map<String,Object> map) throws Exception;
/**
* 获取抽查隐患
* @param map 入参
* @return
* @throws Exception
*/
JSONObject getSpotHazard (Map<String,Object> map) throws Exception;
/**
* 获取隐患分类分级标准
* @param map 入参
* @return
* @throws Exception
*/
JSONObject getStandard (Map<String,Object> map) throws Exception;
}
zh-baseversion-system/src/main/java/com/zehong/system/service/ITCityLevelRegionService.java 0 → 100644
View file @ 8730d2a3
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TCityLevelRegion;
/**
* 市级行政区Service接口
*
* @author zehong
* @date 2024-06-06
*/
public interface ITCityLevelRegionService
{
/**
* 查询市级行政区
*
* @param fId 市级行政区ID
* @return 市级行政区
*/
public TCityLevelRegion selectTCityLevelRegionById(Long fId);
/**
* 查询市级行政区列表
*
* @param tCityLevelRegion 市级行政区
* @return 市级行政区集合
*/
public List<TCityLevelRegion> selectTCityLevelRegionList(TCityLevelRegion tCityLevelRegion);
/**
* 新增市级行政区
*
* @param tCityLevelRegion 市级行政区
* @return 结果
*/
public int insertTCityLevelRegion(TCityLevelRegion tCityLevelRegion);
/**
* 修改市级行政区
*
* @param tCityLevelRegion 市级行政区
* @return 结果
*/
public int updateTCityLevelRegion(TCityLevelRegion tCityLevelRegion);
/**
* 批量删除市级行政区
*
* @param fIds 需要删除的市级行政区ID
* @return 结果
*/
public int deleteTCityLevelRegionByIds(Long[] fIds);
/**
* 删除市级行政区信息
*
* @param fId 市级行政区ID
* @return 结果
*/
public int deleteTCityLevelRegionById(Long fId);
}
zh-baseversion-system/src/main/java/com/zehong/system/service/ITInsSpotRecInforService.java
View file @ 8730d2a3
......@@ -58,4 +58,11 @@ public interface ITInsSpotRecInforService
* @return 结果
*/
public int deleteTInsSpotRecInforById(Long fInsSpotRecInforId);
/**
* 上传调查结果
* @param fInsSpotRecInforId 调查结果id
* @return
*/
int reportSpotRecInfo(Long fInsSpotRecInforId) throws Exception;
}
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/GovernmentSupervisionInfoServiceImpl.java
View file @ 8730d2a3
......@@ -10,6 +10,7 @@ import com.zehong.system.mapper.*;
import com.zehong.system.service.GovernmentSupervisionInfoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -48,6 +49,41 @@ public class GovernmentSupervisionInfoServiceImpl implements GovernmentSupervisi
@Resource
private TInsSurListInforMapper insSurListInforMapper;
@Resource
private TInsSpotHazardRefMapper tInsSpotHazardRefMapper;
@Resource
private TInsStaInforMapper tInsStaInforMapper;
@Resource
private TCityLevelRegionMapper tCityLevelRegionMapper;
/**
* 获取市级行政区
* @param map 入参
* @return
* @throws Exception
*/
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject getCity(Map<String, Object> map) throws Exception {
JSONObject json = governmentDataUtil.getInfo("region/city/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<TCityLevelRegion> tCityLevelRegionList = new ArrayList<>();
for(int i = 0; i < data.size(); i++){
TCityLevelRegionVo proAppInforBrowseVo = JSONObject.toJavaObject(data.getJSONObject(i), TCityLevelRegionVo.class);
TCityLevelRegion cityLevelRegion = new TCityLevelRegion();
GovernmentDataCopyUtil.copyToLocalData(proAppInforBrowseVo,cityLevelRegion);
tCityLevelRegionList.add(cityLevelRegion);
}
tCityLevelRegionMapper.batchInsertTCityLevelRegion(tCityLevelRegionList);
}
return json;
}
/**
* 获取行业专家档案
* @param map 入参
......@@ -185,7 +221,7 @@ public class GovernmentSupervisionInfoServiceImpl implements GovernmentSupervisi
@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());
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<>();
......@@ -200,7 +236,54 @@ public class GovernmentSupervisionInfoServiceImpl implements GovernmentSupervisi
return json;
}
/**
* 获取抽查隐患
* @param map 入参
* @return
* @throws Exception
*/
@Override
public JSONObject getSpotHazard(Map<String, Object> map) throws Exception {
JSONObject json = governmentDataUtil.getInfo("inspection/spot/hazard/reflection","READ",map);
log.info("获取抽查隐患结果=========" + json.toString());
if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
JSONArray data = json.getJSONArray("data");
List<TInsSpotHazardRef> tInsSpotHazardRefList = new ArrayList<>();
for(int i = 0; i < data.size(); i++){
TInsSpotHazardRefVo insSpotHazardRefVo = JSONObject.toJavaObject(data.getJSONObject(i), TInsSpotHazardRefVo.class);
TInsSpotHazardRef insSpotHazardRef = new TInsSpotHazardRef();
GovernmentDataCopyUtil.copyToLocalData(insSpotHazardRefVo,insSpotHazardRef);
tInsSpotHazardRefList.add(insSpotHazardRef);
}
tInsSpotHazardRefMapper.batchInsertTInsSpotHazardRef(tInsSpotHazardRefList);
}
return json;
}
/**
* 获取隐患分类分级标准
* @param map 入参
* @return
* @throws Exception
*/
@Override
public JSONObject getStandard(Map<String, Object> map) throws Exception {
JSONObject json = governmentDataUtil.getInfo("inspection/standard/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<TInsStaInfor> tInsStaInforList = new ArrayList<>();
for(int i = 0; i < data.size(); i++){
TInsStaInforVo insStaInforVo = JSONObject.toJavaObject(data.getJSONObject(i), TInsStaInforVo.class);
TInsStaInfor insStaInfor = new TInsStaInfor();
GovernmentDataCopyUtil.copyToLocalData(insStaInforVo,insStaInfor);
tInsStaInforList.add(insStaInfor);
}
tInsStaInforMapper.batchInsertTInsStaInfor(tInsStaInforList);
}
return json;
}
}
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TCityLevelRegionServiceImpl.java 0 → 100644
View file @ 8730d2a3
package com.zehong.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TCityLevelRegionMapper;
import com.zehong.system.domain.TCityLevelRegion;
import com.zehong.system.service.ITCityLevelRegionService;
/**
* 市级行政区Service业务层处理
*
* @author zehong
* @date 2024-06-06
*/
@Service
public class TCityLevelRegionServiceImpl implements ITCityLevelRegionService
{
@Autowired
private TCityLevelRegionMapper tCityLevelRegionMapper;
/**
* 查询市级行政区
*
* @param fId 市级行政区ID
* @return 市级行政区
*/
@Override
public TCityLevelRegion selectTCityLevelRegionById(Long fId)
{
return tCityLevelRegionMapper.selectTCityLevelRegionById(fId);
}
/**
* 查询市级行政区列表
*
* @param tCityLevelRegion 市级行政区
* @return 市级行政区
*/
@Override
public List<TCityLevelRegion> selectTCityLevelRegionList(TCityLevelRegion tCityLevelRegion)
{
return tCityLevelRegionMapper.selectTCityLevelRegionList(tCityLevelRegion);
}
/**
* 新增市级行政区
*
* @param tCityLevelRegion 市级行政区
* @return 结果
*/
@Override
public int insertTCityLevelRegion(TCityLevelRegion tCityLevelRegion)
{
return tCityLevelRegionMapper.insertTCityLevelRegion(tCityLevelRegion);
}
/**
* 修改市级行政区
*
* @param tCityLevelRegion 市级行政区
* @return 结果
*/
@Override
public int updateTCityLevelRegion(TCityLevelRegion tCityLevelRegion)
{
return tCityLevelRegionMapper.updateTCityLevelRegion(tCityLevelRegion);
}
/**
* 批量删除市级行政区
*
* @param fIds 需要删除的市级行政区ID
* @return 结果
*/
@Override
public int deleteTCityLevelRegionByIds(Long[] fIds)
{
return tCityLevelRegionMapper.deleteTCityLevelRegionByIds(fIds);
}
/**
* 删除市级行政区信息
*
* @param fId 市级行政区ID
* @return 结果
*/
@Override
public int deleteTCityLevelRegionById(Long fId)
{
return tCityLevelRegionMapper.deleteTCityLevelRegionById(fId);
}
}
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TInsSpotRecInforServiceImpl.java
View file @ 8730d2a3
package com.zehong.system.service.impl;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TInsSpotRecInforMapper;
import com.alibaba.fastjson.JSONObject;
import com.zehong.common.exception.CustomException;
import com.zehong.common.utils.GovernmentDataCopyUtil;
import com.zehong.common.utils.GovernmentDataUtil;
import com.zehong.system.domain.TInsSpotRecInfor;
import com.zehong.system.domain.vo.TInsSpotRecInforVo;
import com.zehong.system.mapper.TInsSpotRecInforMapper;
import com.zehong.system.service.ITInsSpotRecInforService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 监督检查-调查结果Service业务层处理
......@@ -17,9 +27,14 @@ import com.zehong.system.service.ITInsSpotRecInforService;
@Service
public class TInsSpotRecInforServiceImpl implements ITInsSpotRecInforService
{
private static final Logger log = LoggerFactory.getLogger(TInsSpotRecInforServiceImpl.class);
@Autowired
private TInsSpotRecInforMapper tInsSpotRecInforMapper;
@Resource
private GovernmentDataUtil governmentDataUtil;
/**
* 查询监督检查-调查结果
*
......@@ -93,4 +108,22 @@ public class TInsSpotRecInforServiceImpl implements ITInsSpotRecInforService
{
return tInsSpotRecInforMapper.deleteTInsSpotRecInforById(fInsSpotRecInforId);
}
/**
* 上传调查结果
* @param fInsSpotRecInforId 调查结果id
* @return
*/
@Override
public int reportSpotRecInfo(Long fInsSpotRecInforId) throws Exception {
TInsSpotRecInfor insSpotRecInfor = tInsSpotRecInforMapper.selectTInsSpotRecInforById(fInsSpotRecInforId);
TInsSpotRecInforVo insSpotRecInforVo = new TInsSpotRecInforVo();
GovernmentDataCopyUtil.copyToGovernData(insSpotRecInfor,insSpotRecInforVo);
List<TInsSpotRecInforVo> data = new ArrayList<>();
data.add(insSpotRecInforVo);
JSONObject reportResult = governmentDataUtil.setInfo("inspection/record/information","WRITE",data);
log.info("上传调查结果===================" + reportResult.toJSONString());
if(!"0".equals(reportResult.getString("resultCode"))) throw new CustomException("上传调查结果市局接口失败");
return 1;
}
}
zh-baseversion-system/src/main/resources/mapper/system/TCityLevelRegionMapper.xml 0 → 100644
View file @ 8730d2a3
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TCityLevelRegionMapper">
<resultMap type="TCityLevelRegion" id="TCityLevelRegionResult">
<result property="fId" column="f_id" />
<result property="fCityCode" column="f_city_code" />
<result property="fName" column="f_name" />
<result property="fSeq" column="f_seq" />
</resultMap>
<sql id="selectTCityLevelRegionVo">
select f_id, f_city_code, f_name, f_seq from t_city_level_region
</sql>
<select id="selectTCityLevelRegionList" parameterType="TCityLevelRegion" resultMap="TCityLevelRegionResult">
<include refid="selectTCityLevelRegionVo"/>
<where>
<if test="fCityCode != null and fCityCode != ''"> and f_city_code = #{fCityCode}</if>
<if test="fName != null and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
<if test="fSeq != null "> and f_seq = #{fSeq}</if>
</where>
</select>
<select id="selectTCityLevelRegionById" parameterType="Long" resultMap="TCityLevelRegionResult">
<include refid="selectTCityLevelRegionVo"/>
where f_id = #{fId}
</select>
<insert id="insertTCityLevelRegion" parameterType="TCityLevelRegion">
insert into t_city_level_region
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fId != null">f_id,</if>
<if test="fCityCode != null and fCityCode != ''">f_city_code,</if>
<if test="fName != null and fName != ''">f_name,</if>
<if test="fSeq != null">f_seq,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fId != null">#{fId},</if>
<if test="fCityCode != null and fCityCode != ''">#{fCityCode},</if>
<if test="fName != null and fName != ''">#{fName},</if>
<if test="fSeq != null">#{fSeq},</if>
</trim>
</insert>
<update id="updateTCityLevelRegion" parameterType="TCityLevelRegion">
update t_city_level_region
<trim prefix="SET" suffixOverrides=",">
<if test="fCityCode != null and fCityCode != ''">f_city_code = #{fCityCode},</if>
<if test="fName != null and fName != ''">f_name = #{fName},</if>
<if test="fSeq != null">f_seq = #{fSeq},</if>
</trim>
where f_id = #{fId}
</update>
<delete id="deleteTCityLevelRegionById" parameterType="Long">
delete from t_city_level_region where f_id = #{fId}
</delete>
<delete id="deleteTCityLevelRegionByIds" parameterType="String">
delete from t_city_level_region where f_id in
<foreach item="fId" collection="array" open="(" separator="," close=")">
#{fId}
</foreach>
</delete>
<insert id="batchInsertTCityLevelRegion" parameterType="TCityLevelRegion">
insert into t_city_level_region(
f_id,
f_city_code,
f_name,
f_seq
)VALUES
<foreach collection="list" separator="," item="item">
(
#{item.fId},
#{item.fCityCode},
#{item.fName},
#{item.fSeq}
)
</foreach>
</insert>
</mapper>
\ No newline at end of file
zh-baseversion-system/src/main/resources/mapper/system/TInsSpotHazardRefMapper.xml
View file @ 8730d2a3
......@@ -104,4 +104,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{fInsSpotHazardRefId}
</foreach>
</delete>
<insert id="batchInsertTInsSpotHazardRef" parameterType="TInsSpotHazardRef" useGeneratedKeys="true" keyProperty="fInsSpotHazardRefId">
insert into t_ins_spot_hazard_ref(
f_hazard_unique_code,
f_hazard_out_unique_code,
f_involve_enterprise_code,
f_obj_type,
f_obj_code,
f_obj_belong_region_id,
f_check_time,
f_hazard_type_level_id,
f_hazard_desc,
f_before_picture,
f_is_enforcement,
f_remark,
f_last_time
)VALUES
<foreach collection="list" separator="," item="item">
(
#{item.fHazardUniqueCode},
#{item.fHazardOutUniqueCode},
#{item.fInvolveEnterpriseCode},
#{item.fObjType},
#{item.fObjCode},
#{item.fObjBelongRegionId},
#{item.fCheckTime},
#{item.fHazardTypeLevelId},
#{item.fHazardDesc},
#{item.fBeforePicture},
#{item.fIsEnforcement},
#{item.fRemark},
#{item.fLastTime}
)
</foreach>
</insert>
</mapper>
\ No newline at end of file
zh-baseversion-system/src/main/resources/mapper/system/TInsStaInforMapper.xml
View file @ 8730d2a3
......@@ -164,4 +164,70 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{fInsStaInforId}
</foreach>
</delete>
<insert id="batchInsertTInsStaInfor" parameterType="TInsStaInfor" useGeneratedKeys="true" keyProperty="fInsStaInforId">
insert into t_ins_sta_infor(
f_hazard_name,
f_hazard_code,
f_hazard_describe,
f_object_type,
f_hazard_category,
f_hazard_link,
f_hazard_level,
f_hazard_definition_source_code,
f_owner_response,
f_administrative_sys_organization_id,
f_administrative_department_name,
f_is_enforcement,
f_enforcement_sys_organization_id,
f_enforcement_department_name,
f_supervision_sys_organization_id,
f_supervision_department_name,
f_rect_require,
f_rect_deadline,
f_hazard_check_basis,
f_check_item_id,
f_check_dept,
f_check_method,
f_enforcement_according,
f_create_by,
f_create_time,
f_update_by,
f_update_time,
f_delete_flag
)VALUES
<foreach collection="list" separator="," item="item">
(
#{item.fHazardName},
#{item.fHazardCode},
#{item.fHazardDescribe},
#{item.fObjectType},
#{item.fHazardCategory},
#{item.fHazardLink},
#{item.fHazardLevel},
#{item.fHazardDefinitionSourceCode},
#{item.fOwnerResponse},
#{item.fAdministrativeSysOrganizationId},
#{item.fAdministrativeDepartmentName},
#{item.fIsEnforcement},
#{item.fEnforcementSysOrganizationId},
#{item.fEnforcementDepartmentName},
#{item.fSupervisionSysOrganizationId},
#{item.fSupervisionDepartmentName},
#{item.fRectRequire},
#{item.fRectDeadline},
#{fHazardCheckBasis},
#{item.fCheckItemId},
#{item.fCheckDept},
#{item.fCheckMethod},
#{item.fEnforcementAccording},
#{item.fCreateBy},
#{item.fCreateTime},
#{item.fUpdateBy},
#{item.fUpdateTime},
#{item.fDeleteFlag}
)
</foreach>
</insert>
</mapper>
\ No newline at end of file
zh-baseversion-web/src/api/supervision/findings.js
View file @ 8730d2a3
......@@ -51,3 +51,12 @@ export function exportInfor(query) {
params: query
})
}
// 导出监督检查-调查结果
export function reportSpotRecInfo(query) {
return request({
url: '/supervision/findings/reportSpotRecInfo',
method: 'get',
params: query
})
}
zh-baseversion-web/src/views/area/city.js 0 → 100644
View file @ 8730d2a3
import request from '@/utils/request'
// 查询市级行政区列表
export function listRegion(query) {
return request({
url: '/area/city/list',
method: 'get',
params: query
})
}
// 查询市级行政区详细
export function getRegion(fId) {
return request({
url: '/area/city/' + fId,
method: 'get'
})
}
// 新增市级行政区
export function addRegion(data) {
return request({
url: '/area/city',
method: 'post',
data: data
})
}
// 修改市级行政区
export function updateRegion(data) {
return request({
url: '/area/city',
method: 'put',
data: data
})
}
// 删除市级行政区
export function delRegion(fId) {
return request({
url: '/area/city/' + fId,
method: 'delete'
})
}
// 导出市级行政区
export function exportRegion(query) {
return request({
url: '/area/city/export',
method: 'get',
params: query
})
}
zh-baseversion-web/src/views/supervision/findings/index.vue
View file @ 8730d2a3
......@@ -120,6 +120,11 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-button
size="mini"
type="text"
@click="handleReport(scope.row)"
>上传</el-button>
</template>
</el-table-column>
</el-table>
......@@ -204,7 +209,7 @@
</template>
<script>
import { listInfor, getInfor, delInfor, addInfor, updateInfor, exportInfor } from "@/api/supervision/findings";
import { listInfor, getInfor, delInfor, addInfor, updateInfor, exportInfor, reportSpotRecInfo } from "@/api/supervision/findings";
import Editor from '@/components/Editor';
import { recordList } from "@/api/supervision/record";
import DetailInfo from "./components/DetailInfo";
......@@ -398,6 +403,19 @@ export default {
handleDetail(row){
this.$refs.detail.getDetailInfo(row.fInsSpotRecInforId);
},
//上传
handleReport(row) {
this.$confirm('是否确认上传调查结果名称为"' + row.fName + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return reportSpotRecInfo({fInsSpotRecInforId: row.fInsSpotRecInforId});
}).then(() => {
this.getList();
this.msgSuccess("上传成功");
}).catch(() => {});
},
}
};
</script>
zh-baseversion-web/src/views/supervision/record/index.vue
View file @ 8730d2a3
......@@ -115,7 +115,7 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope">
<el-button
size="mini"
......
zh-baseversion-web/src/views/supervision/rectification/index.vue
View file @ 8730d2a3
......@@ -153,7 +153,7 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope">
<el-button
size="mini"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment