hanfucheng 3 ヶ月 前
コミット
69d321ef3c
53 ファイル変更0 行追加5717 行削除
  1. 0 197
      src/main/java/com/sooka/sponest/event/emergency/danger/controller/CentereventTEmergencyDangerController.java
  2. 0 298
      src/main/java/com/sooka/sponest/event/emergency/danger/domain/CentereventTEmergencyDanger.java
  3. 0 59
      src/main/java/com/sooka/sponest/event/emergency/danger/mapper/CentereventTEmergencyDangerMapper.java
  4. 0 63
      src/main/java/com/sooka/sponest/event/emergency/danger/service/ICentereventTEmergencyDangerService.java
  5. 0 125
      src/main/java/com/sooka/sponest/event/emergency/danger/service/impl/CentereventTEmergencyDangerServiceImpl.java
  6. 0 92
      src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/controller/CentereventTEmergencyDangerdeptmapController.java
  7. 0 157
      src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/domain/CentereventTEmergencyDangerdeptmap.java
  8. 0 54
      src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/mapper/CentereventTEmergencyDangerdeptmapMapper.java
  9. 0 54
      src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/service/ICentereventTEmergencyDangerdeptmapService.java
  10. 0 84
      src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/service/impl/CentereventTEmergencyDangerdeptmapServiceImpl.java
  11. 0 118
      src/main/java/com/sooka/sponest/event/emergency/dangerprocess/controller/CentereventTEmergencyDangerprocessController.java
  12. 0 199
      src/main/java/com/sooka/sponest/event/emergency/dangerprocess/domain/CentereventTEmergencyDangerprocess.java
  13. 0 10
      src/main/java/com/sooka/sponest/event/emergency/dangerprocess/domain/DayBody.java
  14. 0 63
      src/main/java/com/sooka/sponest/event/emergency/dangerprocess/mapper/CentereventTEmergencyDangerprocessMapper.java
  15. 0 65
      src/main/java/com/sooka/sponest/event/emergency/dangerprocess/service/ICentereventTEmergencyDangerprocessService.java
  16. 0 137
      src/main/java/com/sooka/sponest/event/emergency/dangerprocess/service/impl/CentereventTEmergencyDangerprocessServiceImpl.java
  17. 0 155
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/controller/CentereventTEmergencyInspectionrecordController.java
  18. 0 50
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/controller/EmergencyBigDataController.java
  19. 0 9
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/AttachBean.java
  20. 0 249
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/CentereventTEmergencyInspectionrecord.java
  21. 0 80
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/CentereventTEmergencyInspectionrecordBdody.java
  22. 0 11
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/CentereventTEmergencyInspectionrecordBody.java
  23. 0 12
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/EmergencyInspectionrecordSelectBody.java
  24. 0 70
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/mapper/CentereventTEmergencyInspectionrecordMapper.java
  25. 0 22
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/mapper/EmergencyBigDataMapper.java
  26. 0 75
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/ICentereventTEmergencyInspectionrecordService.java
  27. 0 25
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/IEmergencyBigDataService.java
  28. 0 226
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/impl/CentereventTEmergencyInspectionrecordServiceImpl.java
  29. 0 43
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/impl/EmergencyBigDataServiceImpl.java
  30. 0 118
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/controller/CentereventTEmergencyInspectionrecorddetailController.java
  31. 0 185
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/domain/CentereventTEmergencyInspectionrecorddetail.java
  32. 0 10
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/domain/CentereventTEmergencyInspectionrecorddetailBody.java
  33. 0 76
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/mapper/CentereventTEmergencyInspectionrecorddetailMapper.java
  34. 0 77
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/service/ICentereventTEmergencyInspectionrecorddetailService.java
  35. 0 114
      src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/service/impl/CentereventTEmergencyInspectionrecorddetailServiceImpl.java
  36. 0 108
      src/main/java/com/sooka/sponest/event/emergency/patroloverdue/controller/CentereventTEmergencyPatroloverdueController.java
  37. 0 187
      src/main/java/com/sooka/sponest/event/emergency/patroloverdue/domain/CentereventTEmergencyPatroloverdue.java
  38. 0 62
      src/main/java/com/sooka/sponest/event/emergency/patroloverdue/mapper/CentereventTEmergencyPatroloverdueMapper.java
  39. 0 62
      src/main/java/com/sooka/sponest/event/emergency/patroloverdue/service/ICentereventTEmergencyPatroloverdueService.java
  40. 0 97
      src/main/java/com/sooka/sponest/event/emergency/patroloverdue/service/impl/CentereventTEmergencyPatroloverdueServiceImpl.java
  41. 0 149
      src/main/java/com/sooka/sponest/event/emergency/patrolrecord/controller/CentereventTEmergencyPatrolrecordController.java
  42. 0 277
      src/main/java/com/sooka/sponest/event/emergency/patrolrecord/domain/CentereventTEmergencyPatrolrecord.java
  43. 0 77
      src/main/java/com/sooka/sponest/event/emergency/patrolrecord/mapper/CentereventTEmergencyPatrolrecordMapper.java
  44. 0 67
      src/main/java/com/sooka/sponest/event/emergency/patrolrecord/service/ICentereventTEmergencyPatrolrecordService.java
  45. 0 133
      src/main/java/com/sooka/sponest/event/emergency/patrolrecord/service/impl/CentereventTEmergencyPatrolrecordServiceImpl.java
  46. 0 172
      src/main/resources/mapper/emergency/danger/CentereventTEmergencyDangerMapper.xml
  47. 0 107
      src/main/resources/mapper/emergency/dangerdeptmap/CentereventTEmergencyDangerdeptmapMapper.xml
  48. 0 130
      src/main/resources/mapper/emergency/dangerprocess/CentereventTEmergencyDangerprocessMapper.xml
  49. 0 223
      src/main/resources/mapper/emergency/inspectionrecord/CentereventTEmergencyInspectionrecordMapper.xml
  50. 0 26
      src/main/resources/mapper/emergency/inspectionrecord/EmergencyBigDataMapper.xml
  51. 0 160
      src/main/resources/mapper/emergency/inspectionrecorddetail/CentereventTEmergencyInspectionrecorddetailMapper.xml
  52. 0 119
      src/main/resources/mapper/emergency/patroloverdue/CentereventTEmergencyPatroloverdueMapper.xml
  53. 0 179
      src/main/resources/mapper/emergency/patrolrecord/CentereventTEmergencyPatrolrecordMapper.xml

+ 0 - 197
src/main/java/com/sooka/sponest/event/emergency/danger/controller/CentereventTEmergencyDangerController.java

@@ -1,197 +0,0 @@
-package com.sooka.sponest.event.emergency.danger.controller;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.file.FilePrefixUtils;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
-import com.sooka.sponest.event.emergency.danger.service.ICentereventTEmergencyDangerService;
-import com.sooka.sponest.event.emergency.dangerdeptmap.domain.CentereventTEmergencyDangerdeptmap;
-import com.sooka.sponest.event.emergency.dangerdeptmap.service.ICentereventTEmergencyDangerdeptmapService;
-import com.sooka.sponest.event.emergency.dangerprocess.domain.CentereventTEmergencyDangerprocess;
-import com.sooka.sponest.event.emergency.dangerprocess.service.ICentereventTEmergencyDangerprocessService;
-import com.sooka.sponest.event.emergency.patrolrecord.domain.CentereventTEmergencyPatrolrecord;
-import com.sooka.sponest.event.emergency.patrolrecord.service.ICentereventTEmergencyPatrolrecordService;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import com.sooka.sponest.event.utils.ExcelUtil;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 安全隐患Controller
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@RestController
-@RequestMapping("/danger")
-public class CentereventTEmergencyDangerController extends BaseController {
-
-    @Autowired
-    private ICentereventTEmergencyDangerService centereventTEmergencyDangerService;
-
-    @Autowired
-    private ICentereventTEmergencyDangerdeptmapService centereventTEmergencyDangerdeptmapService;
-
-    @Autowired
-    private ICentereventTEmergencyDangerprocessService centereventTEmergencyDangerprocessService;
-
-    @Autowired
-    private RemoteDataService remoteDataService;
-
-    @Autowired
-    private ICentereventTEmergencyPatrolrecordService centereventTEmergencyPatrolrecordService;
-
-    /**
-     * 查询安全隐患列表
-     */
-    @RequiresPermissions("danger:danger:list")
-    @GetMapping("/list")
-    public TableDataInfo list(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        startPage();
-        List<CentereventTEmergencyDanger> list = centereventTEmergencyDangerService.selectCentereventTEmergencyDangerList(centereventTEmergencyDanger);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("查询安全隐患列表")
-    @GetMapping("/getAllDanger")
-    public R<List<CentereventTEmergencyDanger>> getAllDanger(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        return R.ok(centereventTEmergencyDangerService.selectCentereventTEmergencyDangerList(centereventTEmergencyDanger));
-    }
-
-    /**
-     * 导出安全隐患列表
-     */
-    @RequiresPermissions("danger:danger:export")
-    @Log(title = "安全隐患", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        List<CentereventTEmergencyDanger> list = centereventTEmergencyDangerService.selectCentereventTEmergencyDangerList(centereventTEmergencyDanger);
-        ExcelUtil<CentereventTEmergencyDanger> util = new ExcelUtil<>(CentereventTEmergencyDanger.class);
-        util.exportExcel(response, list, "安全隐患数据");
-    }
-
-    /**
-     * 获取安全隐患详细信息
-     */
-//    @RequiresPermissions("danger:danger:query")
-    @ApiOperation("获取安全隐患详细信息")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centereventTEmergencyDangerService.selectCentereventTEmergencyDangerById(id));
-    }
-
-    @ApiOperation("获取安全隐患、隐患处理过程详细信息")
-    @GetMapping(value = "/getInfoView/{id}")
-    public AjaxResult getInfoView(@PathVariable("id") String id) {
-        Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("danger", centereventTEmergencyDangerService.selectCentereventTEmergencyDangerById(id));
-        resultMap.put("process", centereventTEmergencyDangerprocessService.selectCentereventTEmergencyDangerprocessList(new CentereventTEmergencyDangerprocess(id)));
-        return AjaxResult.success(resultMap);
-    }
-
-    /**
-     * 新增安全隐患
-     */
-//    @RequiresPermissions("danger:danger:add")
-    @ApiOperation("新增安全隐患")
-    @Log(title = "安全隐患", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        int result = centereventTEmergencyDangerService.insertCentereventTEmergencyDanger(centereventTEmergencyDanger);
-        if (result > 0) {
-            // 责任部门
-            CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap = new CentereventTEmergencyDangerdeptmap();
-            centereventTEmergencyDangerdeptmap.setDangerId(centereventTEmergencyDanger.getId());
-            centereventTEmergencyDangerdeptmap.setHandleStatus("dept_handleType_1");
-            centereventTEmergencyDangerdeptmap.setDeptId(centereventTEmergencyDanger.getDeptId());
-            centereventTEmergencyDangerdeptmap.setDeptName(centereventTEmergencyDanger.getDeptName());
-            centereventTEmergencyDangerdeptmapService.insertCentereventTEmergencyDangerdeptmap(centereventTEmergencyDangerdeptmap);
-            // 联动部门
-            centereventTEmergencyDanger.getDepts().forEach(item -> {
-                item.setDangerId(centereventTEmergencyDanger.getId());
-                item.setHandleStatus("dept_handleType_2");
-                centereventTEmergencyDangerdeptmapService.insertCentereventTEmergencyDangerdeptmap(item);
-            });
-            // 日志
-            centereventTEmergencyDanger.setDangerStatusLabel("整改中");
-            centereventTEmergencyDangerprocessService.insertCentereventTEmergencyDangerprocess(centereventTEmergencyDanger);
-            // 附件
-            centereventTEmergencyDanger.getAttachs().forEach(item -> {
-                CenterdataTAttach attach = new CenterdataTAttach();
-                attach.setBusId(centereventTEmergencyDanger.getId());
-                attach.setAttachPath(item.getAttachPath());
-                attach.setBusIndx("bus_indx_danger");
-                attach.setBusSource("APP");
-                attach.setFileName(item.getFileName());
-                attach.setFileType(FilePrefixUtils.getUrlSuffix(item.getAttachPath()));
-                remoteDataService.insertAttach(attach);
-            });
-            // 巡检反绑隐患id
-            CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord = new CentereventTEmergencyPatrolrecord();
-            centereventTEmergencyPatrolrecord.setId(centereventTEmergencyDanger.getDangerStatusLabel());// 新增时label字段传入的是巡检id
-            centereventTEmergencyPatrolrecord.setIsHavedanger("1");// 0否1是
-            centereventTEmergencyPatrolrecord.setDangerId(centereventTEmergencyDanger.getId());
-            centereventTEmergencyPatrolrecordService.updateCentereventTEmergencyPatrolrecord(centereventTEmergencyPatrolrecord);
-        }
-        return toAjax(result);
-    }
-
-    /**
-     * 修改安全隐患
-     */
-//    @RequiresPermissions("danger:danger:edit")
-    @ApiOperation("修改安全隐患流程")
-    @Log(title = "安全隐患", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        String userId = SecurityUtils.getUserId().toString();
-        CentereventTEmergencyDanger danger = centereventTEmergencyDangerService.selectCentereventTEmergencyDangerById(centereventTEmergencyDanger.getId());
-        if (!userId.equals(danger.getCreateBy())) {
-            return AjaxResult.error("无更改权限");
-        }
-        danger.setDangerStatus(centereventTEmergencyDanger.getDangerStatus());
-        danger.setDangerStatusLabel(centereventTEmergencyDanger.getDangerStatusLabel());
-        int result = centereventTEmergencyDangerService.updateCentereventTEmergencyDanger(danger);
-        if (result > 0) {
-            // 日志
-            danger.setDangerContent(centereventTEmergencyDanger.getDangerContent());
-            centereventTEmergencyDangerprocessService.insertCentereventTEmergencyDangerprocess(danger);
-        }
-        return toAjax(result);
-    }
-
-    /**
-     * 删除安全隐患
-     */
-    @RequiresPermissions("danger:danger:remove")
-    @Log(title = "安全隐患", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids) {
-        return toAjax(centereventTEmergencyDangerService.deleteCentereventTEmergencyDangerByIds(ids));
-    }
-
-    @ApiOperation("查询当月每日隐患数量")
-    @PostMapping("/selectDangerByCalendar")
-    public R selectDangerByCalendar(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        return R.ok(centereventTEmergencyDangerService.selectDangerByCalendar(centereventTEmergencyDanger));
-    }
-
-    @GetMapping("/selectStatsMap")
-    public AjaxResult selectStatsMap() {
-        return AjaxResult.success(centereventTEmergencyDangerService.selectStatsMap());
-    }
-}

+ 0 - 298
src/main/java/com/sooka/sponest/event/emergency/danger/domain/CentereventTEmergencyDanger.java

@@ -1,298 +0,0 @@
-package com.sooka.sponest.event.emergency.danger.domain;
-
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import com.sooka.sponest.event.emergency.dangerdeptmap.domain.CentereventTEmergencyDangerdeptmap;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 安全隐患对象 centerevent_t_emergency_danger
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public class CentereventTEmergencyDanger extends BaseBusinessEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    private String id;
-
-    /**
-     * 标题
-     */
-    @Excel(name = "标题")
-    @NotBlank
-    private String dangerTitle;
-
-    /**
-     * 内容
-     */
-    @Excel(name = "内容")
-    @NotBlank
-    private String dangerContent;
-
-    /**
-     * 企业id
-     */
-    @NotBlank
-    private String enterpriseId;
-
-    /**
-     * 企业名称
-     */
-    @Excel(name = "企业名称")
-    @NotBlank
-    private String enterpriseName;
-
-    /**
-     * 来源
-     */
-    @Excel(name = "来源", dictType = "emergency_danger_source")
-    @NotBlank
-    private String dangerSource;
-
-    /**
-     * 隐患状态
-     */
-    @Excel(name = "隐患状态", dictType = "emergency_trouble_status")
-    private String dangerStatus;
-    @NotBlank
-    private String dangerStatusLabel;
-
-    /**
-     * 经度
-     */
-    @Excel(name = "经度")
-    @NotBlank
-    private String longitude;
-
-    /**
-     * 纬度
-     */
-    @Excel(name = "纬度")
-    @NotBlank
-    private String latitude;
-
-    /**
-     * 地址
-     */
-    private String dangerAddress;
-
-    /**
-     * 隐患报告
-     */
-    private String dangerReport;// 充当上报人使用
-
-    /**
-     * 是否上报应急局
-     */
-    private String isupyjj;
-
-    /**
-     * 数据状态(1-可用 2-不可用 )
-     */
-    private String dataStatus;
-
-    @NotBlank
-    private String deptId;// 所属部门
-    @NotBlank
-    private String deptName;// 所属部门
-    List<CentereventTEmergencyDangerdeptmap> depts = new ArrayList<>();// 联动部门
-    List<CenterdataTAttach> attachs = new ArrayList<>();// 图片
-    @NotBlank
-    private String telphone;// 企业安全负责人电话号
-    private String createDate;// 日期,可视化查询参数
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getDangerTitle() {
-        return dangerTitle;
-    }
-
-    public void setDangerTitle(String dangerTitle) {
-        this.dangerTitle = dangerTitle;
-    }
-
-    public String getDangerContent() {
-        return dangerContent;
-    }
-
-    public void setDangerContent(String dangerContent) {
-        this.dangerContent = dangerContent;
-    }
-
-    public String getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(String enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getEnterpriseName() {
-        return enterpriseName;
-    }
-
-    public void setEnterpriseName(String enterpriseName) {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getDangerSource() {
-        return dangerSource;
-    }
-
-    public void setDangerSource(String dangerSource) {
-        this.dangerSource = dangerSource;
-    }
-
-    public String getDangerStatus() {
-        return dangerStatus;
-    }
-
-    public void setDangerStatus(String dangerStatus) {
-        this.dangerStatus = dangerStatus;
-    }
-
-    public String getDangerStatusLabel() {
-        return dangerStatusLabel;
-    }
-
-    public void setDangerStatusLabel(String dangerStatusLabel) {
-        this.dangerStatusLabel = dangerStatusLabel;
-    }
-
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getDangerAddress() {
-        return dangerAddress;
-    }
-
-    public void setDangerAddress(String dangerAddress) {
-        this.dangerAddress = dangerAddress;
-    }
-
-    public String getDangerReport() {
-        return dangerReport;
-    }
-
-    public void setDangerReport(String dangerReport) {
-        this.dangerReport = dangerReport;
-    }
-
-    public String getIsupyjj() {
-        return isupyjj;
-    }
-
-    public void setIsupyjj(String isupyjj) {
-        this.isupyjj = isupyjj;
-    }
-
-    public String getDataStatus() {
-        return dataStatus;
-    }
-
-    public void setDataStatus(String dataStatus) {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public List<CentereventTEmergencyDangerdeptmap> getDepts() {
-        return depts;
-    }
-
-    public void setDepts(List<CentereventTEmergencyDangerdeptmap> depts) {
-        this.depts = depts;
-    }
-
-    public List<CenterdataTAttach> getAttachs() {
-        return attachs;
-    }
-
-    public void setAttachs(List<CenterdataTAttach> attachs) {
-        this.attachs = attachs;
-    }
-
-    public String getTelphone() {
-        return telphone;
-    }
-
-    public void setTelphone(String telphone) {
-        this.telphone = telphone;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("dataDeptId", getDataDeptId())
-                .append("dataStatus", getDataStatus())
-                .append("longitude", getLongitude())
-                .append("latitude", getLatitude())
-                .append("dangerStatus", getDangerStatus())
-                .append("dangerTitle", getDangerTitle())
-                .append("dangerContent", getDangerContent())
-                .append("enterpriseId", getEnterpriseId())
-                .append("enterpriseName", getEnterpriseName())
-                .append("dangerAddress", getDangerAddress())
-                .append("dangerSource", getDangerSource())
-                .append("dangerReport", getDangerReport())
-                .append("isupyjj", getIsupyjj())
-                .toString();
-    }
-}

+ 0 - 59
src/main/java/com/sooka/sponest/event/emergency/danger/mapper/CentereventTEmergencyDangerMapper.java

@@ -1,59 +0,0 @@
-package com.sooka.sponest.event.emergency.danger.mapper;
-
-import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 安全隐患Mapper接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface CentereventTEmergencyDangerMapper {
-
-    /**
-     * 查询安全隐患列表
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 安全隐患集合
-     */
-    List<CentereventTEmergencyDanger> selectCentereventTEmergencyDangerList(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    /**
-     * 查询安全隐患
-     *
-     * @param id 安全隐患主键
-     * @return 安全隐患
-     */
-    CentereventTEmergencyDanger selectCentereventTEmergencyDangerById(String id);
-
-    /**
-     * 新增安全隐患
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 结果
-     */
-    int insertCentereventTEmergencyDanger(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    /**
-     * 修改安全隐患
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 结果
-     */
-    int updateCentereventTEmergencyDanger(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    /**
-     * 批量删除安全隐患
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteCentereventTEmergencyDangerByIds(String[] ids);
-
-    List<Map<String, Object>> selectDangerByCalendar(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    List<Map> selectStatsMap(CentereventTEmergencyDanger centereventTEmergencyDanger);
-}

+ 0 - 63
src/main/java/com/sooka/sponest/event/emergency/danger/service/ICentereventTEmergencyDangerService.java

@@ -1,63 +0,0 @@
-package com.sooka.sponest.event.emergency.danger.service;
-
-import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 安全隐患Service接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface ICentereventTEmergencyDangerService {
-
-    /**
-     * 查询安全隐患列表
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 安全隐患集合
-     */
-    List<CentereventTEmergencyDanger> selectCentereventTEmergencyDangerList(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    /**
-     * 查询安全隐患
-     *
-     * @param id 安全隐患主键
-     * @return 安全隐患
-     */
-    CentereventTEmergencyDanger selectCentereventTEmergencyDangerById(String id);
-
-    /**
-     * 新增安全隐患
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 结果
-     */
-    int insertCentereventTEmergencyDanger(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    /**
-     * 修改安全隐患
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 结果
-     */
-    int updateCentereventTEmergencyDanger(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    /**
-     * 批量删除安全隐患
-     *
-     * @param ids 需要删除的安全隐患主键集合
-     * @return 结果
-     */
-    int deleteCentereventTEmergencyDangerByIds(String[] ids);
-
-    List<Map<String, Object>> selectDangerByCalendar(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    /**
-     * 大数据统计安全隐患
-     * @return
-     */
-    List<Map> selectStatsMap();
-}

+ 0 - 125
src/main/java/com/sooka/sponest/event/emergency/danger/service/impl/CentereventTEmergencyDangerServiceImpl.java

@@ -1,125 +0,0 @@
-package com.sooka.sponest.event.emergency.danger.service.impl;
-
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
-import com.ruoyi.common.datascope.base.service.BaseService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteConfigService;
-import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
-import com.sooka.sponest.event.emergency.danger.mapper.CentereventTEmergencyDangerMapper;
-import com.sooka.sponest.event.emergency.danger.service.ICentereventTEmergencyDangerService;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-import static com.sooka.sponest.event.utils.EventConstants.FILE_PREFIX_LOCAL;
-
-/**
- * 安全隐患Service业务层处理
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@Service
-public class CentereventTEmergencyDangerServiceImpl extends BaseService implements ICentereventTEmergencyDangerService {
-
-    @Autowired
-    private CentereventTEmergencyDangerMapper centereventTEmergencyDangerMapper;
-
-    @Autowired
-    private RemoteDataService remoteDataService;
-
-    /**
-     * 查询安全隐患列表
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 安全隐患
-     */
-    @DataScopeMutiDept(deptAlias = "d")
-    @Override
-    public List<CentereventTEmergencyDanger> selectCentereventTEmergencyDangerList(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        setSookaDataBase(centereventTEmergencyDanger);
-        return centereventTEmergencyDangerMapper.selectCentereventTEmergencyDangerList(centereventTEmergencyDanger);
-    }
-
-    /**
-     * 查询安全隐患
-     *
-     * @param id 安全隐患主键
-     * @return 安全隐患
-     */
-    @Override
-    public CentereventTEmergencyDanger selectCentereventTEmergencyDangerById(String id) {
-        CentereventTEmergencyDanger centereventTEmergencyDanger = centereventTEmergencyDangerMapper.selectCentereventTEmergencyDangerById(id);
-        CenterdataTAttach centerdataTAttach = new CenterdataTAttach();
-        centerdataTAttach.setBusId(centereventTEmergencyDanger.getId());
-        List<CenterdataTAttach> attachs = remoteDataService.remoteattachlist(centerdataTAttach).getData();
-        if (StringUtils.isNotEmpty(attachs)) {
-            String prefix = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(FILE_PREFIX_LOCAL).getData();
-            attachs.forEach(item -> item.setAttachPath(prefix + item.getAttachPath()));
-        }
-        centereventTEmergencyDanger.setAttachs(attachs);
-        return centereventTEmergencyDanger;
-    }
-
-    /**
-     * 新增安全隐患
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 结果
-     */
-    @Override
-    public int insertCentereventTEmergencyDanger(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        centereventTEmergencyDanger.setId(IdUtils.fastSimpleUUID());
-        centereventTEmergencyDanger.setCreateBy(SecurityUtils.getUserId().toString());
-        centereventTEmergencyDanger.setCreateTime(DateUtils.getNowDate());
-        centereventTEmergencyDanger.setDangerStatus("trouble_status_2");// 整改中
-        centereventTEmergencyDanger.setDangerReport(SecurityUtils.getLoginUser().getSysUser().getNickName());
-        return centereventTEmergencyDangerMapper.insertCentereventTEmergencyDanger(centereventTEmergencyDanger);
-    }
-
-    /**
-     * 修改安全隐患
-     *
-     * @param centereventTEmergencyDanger 安全隐患
-     * @return 结果
-     */
-    @Override
-    public int updateCentereventTEmergencyDanger(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        centereventTEmergencyDanger.setUpdateBy(SecurityUtils.getUserId());
-        centereventTEmergencyDanger.setUpdateTime(DateUtils.getNowDate());
-        return centereventTEmergencyDangerMapper.updateCentereventTEmergencyDanger(centereventTEmergencyDanger);
-    }
-
-    /**
-     * 批量删除安全隐患
-     *
-     * @param ids 需要删除的安全隐患主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyDangerByIds(String[] ids) {
-        return centereventTEmergencyDangerMapper.deleteCentereventTEmergencyDangerByIds(ids);
-    }
-
-    @DataScopeMutiDept(deptAlias = "d")
-    @Override
-    public List<Map<String, Object>> selectDangerByCalendar(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        setSookaDataBase(centereventTEmergencyDanger);
-        return centereventTEmergencyDangerMapper.selectDangerByCalendar(centereventTEmergencyDanger);
-    }
-
-    @Override
-    public List<Map> selectStatsMap() {
-        CentereventTEmergencyDanger centereventTEmergencyDanger = new CentereventTEmergencyDanger();
-        setSookaDataBase(centereventTEmergencyDanger);
-        return centereventTEmergencyDangerMapper.selectStatsMap(centereventTEmergencyDanger);
-    }
-}

+ 0 - 92
src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/controller/CentereventTEmergencyDangerdeptmapController.java

@@ -1,92 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerdeptmap.controller;
-
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.sooka.sponest.event.emergency.dangerdeptmap.domain.CentereventTEmergencyDangerdeptmap;
-import com.sooka.sponest.event.emergency.dangerdeptmap.service.ICentereventTEmergencyDangerdeptmapService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 隐患对应部门Controller
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@RestController
-@RequestMapping("/dangerdeptmap")
-public class CentereventTEmergencyDangerdeptmapController extends BaseController {
-
-    @Autowired
-    private ICentereventTEmergencyDangerdeptmapService centereventTEmergencyDangerdeptmapService;
-
-    /**
-     * 查询隐患对应部门列表
-     */
-    @RequiresPermissions("dangerdeptmap:dangerdeptmap:list")
-    @GetMapping("/list")
-    public TableDataInfo list(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap) {
-        startPage();
-        List<CentereventTEmergencyDangerdeptmap> list = centereventTEmergencyDangerdeptmapService.selectCentereventTEmergencyDangerdeptmapList(centereventTEmergencyDangerdeptmap);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出隐患对应部门列表
-     */
-    @RequiresPermissions("dangerdeptmap:dangerdeptmap:export")
-    @Log(title = "隐患对应部门", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap) {
-        List<CentereventTEmergencyDangerdeptmap> list = centereventTEmergencyDangerdeptmapService.selectCentereventTEmergencyDangerdeptmapList(centereventTEmergencyDangerdeptmap);
-        ExcelUtil<CentereventTEmergencyDangerdeptmap> util = new ExcelUtil<>(CentereventTEmergencyDangerdeptmap.class);
-        util.exportExcel(response, list, "隐患对应部门数据");
-    }
-
-    /**
-     * 获取隐患对应部门详细信息
-     */
-    @RequiresPermissions("dangerdeptmap:dangerdeptmap:query")
-    @GetMapping(value = "/{pkId}")
-    public AjaxResult getInfo(@PathVariable("pkId") String pkId) {
-        return AjaxResult.success(centereventTEmergencyDangerdeptmapService.selectCentereventTEmergencyDangerdeptmapByPkId(pkId));
-    }
-
-    /**
-     * 新增隐患对应部门
-     */
-    @RequiresPermissions("dangerdeptmap:dangerdeptmap:add")
-    @Log(title = "隐患对应部门", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap) {
-        return toAjax(centereventTEmergencyDangerdeptmapService.insertCentereventTEmergencyDangerdeptmap(centereventTEmergencyDangerdeptmap));
-    }
-
-    /**
-     * 修改隐患对应部门
-     */
-    @RequiresPermissions("dangerdeptmap:dangerdeptmap:edit")
-    @Log(title = "隐患对应部门", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap) {
-        return toAjax(centereventTEmergencyDangerdeptmapService.updateCentereventTEmergencyDangerdeptmap(centereventTEmergencyDangerdeptmap));
-    }
-
-    /**
-     * 删除隐患对应部门
-     */
-    @RequiresPermissions("dangerdeptmap:dangerdeptmap:remove")
-    @Log(title = "隐患对应部门", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{pkIds}")
-    public AjaxResult remove(@PathVariable String[] pkIds) {
-        return toAjax(centereventTEmergencyDangerdeptmapService.deleteCentereventTEmergencyDangerdeptmapByPkIds(pkIds));
-    }
-}

+ 0 - 157
src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/domain/CentereventTEmergencyDangerdeptmap.java

@@ -1,157 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerdeptmap.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
-
-/**
- * 隐患对应部门对象 centerevent_t_emergency_dangerdeptmap
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public class CentereventTEmergencyDangerdeptmap extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String pkId;
-
-    /** 删除人 */
-    @Excel(name = "删除人")
-    private String deleteBy;
-
-    /** 删除时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deleteTime;
-
-    /** 数据状态 */
-    @Excel(name = "数据状态")
-    private String dataStatus;
-
-    /** 部门id */
-    @Excel(name = "部门id")
-    private String deptId;
-
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /** 隐患id */
-    @Excel(name = "隐患id")
-    private String dangerId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String handleStatus;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long owndeptid;
-
-    public void setPkId(String pkId)
-    {
-        this.pkId = pkId;
-    }
-
-    public String getPkId()
-    {
-        return pkId;
-    }
-    public void setDeleteBy(String deleteBy)
-    {
-        this.deleteBy = deleteBy;
-    }
-
-    public String getDeleteBy()
-    {
-        return deleteBy;
-    }
-    public void setDeleteTime(Date deleteTime)
-    {
-        this.deleteTime = deleteTime;
-    }
-
-    public Date getDeleteTime()
-    {
-        return deleteTime;
-    }
-    public void setDataStatus(String dataStatus)
-    {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDataStatus()
-    {
-        return dataStatus;
-    }
-    public void setDeptId(String deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public String getDeptId()
-    {
-        return deptId;
-    }
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-    public void setDangerId(String dangerId)
-    {
-        this.dangerId = dangerId;
-    }
-
-    public String getDangerId()
-    {
-        return dangerId;
-    }
-    public void setHandleStatus(String handleStatus)
-    {
-        this.handleStatus = handleStatus;
-    }
-
-    public String getHandleStatus()
-    {
-        return handleStatus;
-    }
-    public void setOwndeptid(Long owndeptid)
-    {
-        this.owndeptid = owndeptid;
-    }
-
-    public Long getOwndeptid()
-    {
-        return owndeptid;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("pkId", getPkId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("deleteBy", getDeleteBy())
-            .append("deleteTime", getDeleteTime())
-            .append("dataStatus", getDataStatus())
-            .append("deptId", getDeptId())
-            .append("deptName", getDeptName())
-            .append("dangerId", getDangerId())
-            .append("handleStatus", getHandleStatus())
-            .append("owndeptid", getOwndeptid())
-            .toString();
-    }
-}

+ 0 - 54
src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/mapper/CentereventTEmergencyDangerdeptmapMapper.java

@@ -1,54 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerdeptmap.mapper;
-
-import com.sooka.sponest.event.emergency.dangerdeptmap.domain.CentereventTEmergencyDangerdeptmap;
-
-import java.util.List;
-
-/**
- * 隐患对应部门Mapper接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface CentereventTEmergencyDangerdeptmapMapper {
-
-    /**
-     * 查询隐患对应部门列表
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 隐患对应部门集合
-     */
-    List<CentereventTEmergencyDangerdeptmap> selectCentereventTEmergencyDangerdeptmapList(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap);
-
-    /**
-     * 查询隐患对应部门
-     *
-     * @param pkId 隐患对应部门主键
-     * @return 隐患对应部门
-     */
-    CentereventTEmergencyDangerdeptmap selectCentereventTEmergencyDangerdeptmapByPkId(String pkId);
-
-    /**
-     * 新增隐患对应部门
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 结果
-     */
-    int insertCentereventTEmergencyDangerdeptmap(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap);
-
-    /**
-     * 修改隐患对应部门
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 结果
-     */
-    int updateCentereventTEmergencyDangerdeptmap(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap);
-
-    /**
-     * 批量删除隐患对应部门
-     *
-     * @param pkIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteCentereventTEmergencyDangerdeptmapByPkIds(String[] pkIds);
-}

+ 0 - 54
src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/service/ICentereventTEmergencyDangerdeptmapService.java

@@ -1,54 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerdeptmap.service;
-
-import com.sooka.sponest.event.emergency.dangerdeptmap.domain.CentereventTEmergencyDangerdeptmap;
-
-import java.util.List;
-
-/**
- * 隐患对应部门Service接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface ICentereventTEmergencyDangerdeptmapService {
-
-    /**
-     * 查询隐患对应部门列表
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 隐患对应部门集合
-     */
-    List<CentereventTEmergencyDangerdeptmap> selectCentereventTEmergencyDangerdeptmapList(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap);
-
-    /**
-     * 查询隐患对应部门
-     *
-     * @param pkId 隐患对应部门主键
-     * @return 隐患对应部门
-     */
-    CentereventTEmergencyDangerdeptmap selectCentereventTEmergencyDangerdeptmapByPkId(String pkId);
-
-    /**
-     * 新增隐患对应部门
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 结果
-     */
-    int insertCentereventTEmergencyDangerdeptmap(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap);
-
-    /**
-     * 修改隐患对应部门
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 结果
-     */
-    int updateCentereventTEmergencyDangerdeptmap(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap);
-
-    /**
-     * 批量删除隐患对应部门
-     *
-     * @param pkIds 需要删除的隐患对应部门主键集合
-     * @return 结果
-     */
-    int deleteCentereventTEmergencyDangerdeptmapByPkIds(String[] pkIds);
-}

+ 0 - 84
src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/service/impl/CentereventTEmergencyDangerdeptmapServiceImpl.java

@@ -1,84 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerdeptmap.service.impl;
-
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.sooka.sponest.event.emergency.dangerdeptmap.domain.CentereventTEmergencyDangerdeptmap;
-import com.sooka.sponest.event.emergency.dangerdeptmap.mapper.CentereventTEmergencyDangerdeptmapMapper;
-import com.sooka.sponest.event.emergency.dangerdeptmap.service.ICentereventTEmergencyDangerdeptmapService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 隐患对应部门Service业务层处理
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@Service
-public class CentereventTEmergencyDangerdeptmapServiceImpl implements ICentereventTEmergencyDangerdeptmapService {
-
-    @Autowired
-    private CentereventTEmergencyDangerdeptmapMapper centereventTEmergencyDangerdeptmapMapper;
-
-    /**
-     * 查询隐患对应部门列表
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 隐患对应部门
-     */
-    @Override
-    public List<CentereventTEmergencyDangerdeptmap> selectCentereventTEmergencyDangerdeptmapList(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap) {
-        return centereventTEmergencyDangerdeptmapMapper.selectCentereventTEmergencyDangerdeptmapList(centereventTEmergencyDangerdeptmap);
-    }
-
-    /**
-     * 查询隐患对应部门
-     *
-     * @param pkId 隐患对应部门主键
-     * @return 隐患对应部门
-     */
-    @Override
-    public CentereventTEmergencyDangerdeptmap selectCentereventTEmergencyDangerdeptmapByPkId(String pkId) {
-        return centereventTEmergencyDangerdeptmapMapper.selectCentereventTEmergencyDangerdeptmapByPkId(pkId);
-    }
-
-    /**
-     * 新增隐患对应部门
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 结果
-     */
-    @Override
-    public int insertCentereventTEmergencyDangerdeptmap(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap) {
-        centereventTEmergencyDangerdeptmap.setPkId(IdUtils.fastSimpleUUID());
-        centereventTEmergencyDangerdeptmap.setCreateBy(SecurityUtils.getUserId().toString());
-        centereventTEmergencyDangerdeptmap.setCreateTime(DateUtils.getNowDate());
-        return centereventTEmergencyDangerdeptmapMapper.insertCentereventTEmergencyDangerdeptmap(centereventTEmergencyDangerdeptmap);
-    }
-
-    /**
-     * 修改隐患对应部门
-     *
-     * @param centereventTEmergencyDangerdeptmap 隐患对应部门
-     * @return 结果
-     */
-    @Override
-    public int updateCentereventTEmergencyDangerdeptmap(CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap) {
-        centereventTEmergencyDangerdeptmap.setUpdateTime(DateUtils.getNowDate());
-        return centereventTEmergencyDangerdeptmapMapper.updateCentereventTEmergencyDangerdeptmap(centereventTEmergencyDangerdeptmap);
-    }
-
-    /**
-     * 批量删除隐患对应部门
-     *
-     * @param pkIds 需要删除的隐患对应部门主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyDangerdeptmapByPkIds(String[] pkIds) {
-        return centereventTEmergencyDangerdeptmapMapper.deleteCentereventTEmergencyDangerdeptmapByPkIds(pkIds);
-    }
-}

+ 0 - 118
src/main/java/com/sooka/sponest/event/emergency/dangerprocess/controller/CentereventTEmergencyDangerprocessController.java

@@ -1,118 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerprocess.controller;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.sooka.sponest.event.emergency.danger.service.ICentereventTEmergencyDangerService;
-import com.sooka.sponest.event.emergency.dangerprocess.domain.CentereventTEmergencyDangerprocess;
-import com.sooka.sponest.event.emergency.dangerprocess.domain.DayBody;
-import com.sooka.sponest.event.emergency.dangerprocess.service.ICentereventTEmergencyDangerprocessService;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 隐患处理过程Controller
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@RestController
-@RequestMapping("/dangerprocess")
-public class CentereventTEmergencyDangerprocessController extends BaseController {
-
-    @Autowired
-    private ICentereventTEmergencyDangerprocessService centereventTEmergencyDangerprocessService;
-
-    @Autowired
-    private ICentereventTEmergencyDangerService centereventTEmergencyDangerService;
-
-    @Autowired
-    private RemoteDataService remoteDataService;
-
-    /**
-     * 查询隐患处理过程列表
-     */
-    @RequiresPermissions("dangerprocess:dangerprocess:list")
-    @GetMapping("/list")
-    public TableDataInfo list(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        startPage();
-        List<CentereventTEmergencyDangerprocess> list = centereventTEmergencyDangerprocessService.selectCentereventTEmergencyDangerprocessList(centereventTEmergencyDangerprocess);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/getAllDangerprocess")
-    public R<List<CentereventTEmergencyDangerprocess>> getAllDangerprocess(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        return R.ok(centereventTEmergencyDangerprocessService.selectCentereventTEmergencyDangerprocessList(centereventTEmergencyDangerprocess));
-    }
-
-    /**
-     * 导出隐患处理过程列表
-     */
-    @RequiresPermissions("dangerprocess:dangerprocess:export")
-    @Log(title = "隐患处理过程", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        List<CentereventTEmergencyDangerprocess> list = centereventTEmergencyDangerprocessService.selectCentereventTEmergencyDangerprocessList(centereventTEmergencyDangerprocess);
-        ExcelUtil<CentereventTEmergencyDangerprocess> util = new ExcelUtil<>(CentereventTEmergencyDangerprocess.class);
-        util.exportExcel(response, list, "隐患处理过程数据");
-    }
-
-    /**
-     * 获取隐患处理过程详细信息
-     */
-    @RequiresPermissions("dangerprocess:dangerprocess:query")
-    @GetMapping(value = "/{pkId}")
-    public AjaxResult getInfo(@PathVariable("pkId") String pkId) {
-        return AjaxResult.success(centereventTEmergencyDangerprocessService.selectCentereventTEmergencyDangerprocessByPkId(pkId));
-    }
-
-    /**
-     * 新增隐患处理过程
-     */
-//    @RequiresPermissions("dangerprocess:dangerprocess:add")
-    @ApiOperation("新增隐患处理过程")
-    @Log(title = "隐患处理过程", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        String enterpriseId = centereventTEmergencyDangerService.selectCentereventTEmergencyDangerById(centereventTEmergencyDangerprocess.getDangerId()).getEnterpriseId();
-        String telphone = remoteDataService.getEnterprise(enterpriseId).getData().getSecChargerPhone();
-        centereventTEmergencyDangerprocess.setTelphone(telphone);
-        return toAjax(centereventTEmergencyDangerprocessService.insertCentereventTEmergencyDangerprocess(centereventTEmergencyDangerprocess));
-    }
-
-    /**
-     * 修改隐患处理过程
-     */
-    @RequiresPermissions("dangerprocess:dangerprocess:edit")
-    @Log(title = "隐患处理过程", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        return toAjax(centereventTEmergencyDangerprocessService.updateCentereventTEmergencyDangerprocess(centereventTEmergencyDangerprocess));
-    }
-
-    /**
-     * 删除隐患处理过程
-     */
-    @RequiresPermissions("dangerprocess:dangerprocess:remove")
-    @Log(title = "隐患处理过程", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{pkIds}")
-    public AjaxResult remove(@PathVariable String[] pkIds) {
-        return toAjax(centereventTEmergencyDangerprocessService.deleteCentereventTEmergencyDangerprocessByPkIds(pkIds));
-    }
-
-    @GetMapping("/getHeatMap")
-    public AjaxResult getHeatMap(DayBody dayBody) {
-        return AjaxResult.success(centereventTEmergencyDangerprocessService.getHeatMap(dayBody));
-    }
-}

+ 0 - 199
src/main/java/com/sooka/sponest/event/emergency/dangerprocess/domain/CentereventTEmergencyDangerprocess.java

@@ -1,199 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerprocess.domain;
-
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * 隐患处理过程对象 centerevent_t_emergency_dangerprocess
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public class CentereventTEmergencyDangerprocess extends BaseEntity {
-
-    public CentereventTEmergencyDangerprocess() {
-
-    }
-
-    public CentereventTEmergencyDangerprocess(String dangerId) {
-        this.dangerId = dangerId;
-    }
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    private String id;
-
-    /**
-     * 数据状态
-     */
-    @Excel(name = "数据状态")
-    private String dataStatus;
-
-    /**
-     * 隐患id
-     */
-    @Excel(name = "隐患id")
-    @NotBlank
-    private String dangerId;
-
-    /**
-     * 处理人id
-     */
-    @Excel(name = "处理人id")
-    private Long userId;
-
-    /**
-     * 处理人姓名
-     */
-    @Excel(name = "处理人姓名")
-    @NotBlank
-    private String userName;
-
-    /**
-     * 处理描述
-     */
-    @Excel(name = "处理描述")
-    @NotBlank
-    private String processDes;
-
-    /**
-     * 处理人所属部门id
-     */
-    @Excel(name = "处理人所属部门id")
-    private Long deptId;
-
-    /**
-     * 处理人所属部门名称
-     */
-    @Excel(name = "处理人所属部门名称")
-    private String deptName;
-
-    /**
-     * $column.columnComment
-     */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String processType;
-
-    /**
-     * $column.columnComment
-     */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long owndeptid;
-
-    private String telphone;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getDataStatus() {
-        return dataStatus;
-    }
-
-    public void setDataStatus(String dataStatus) {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDangerId() {
-        return dangerId;
-    }
-
-    public void setDangerId(String dangerId) {
-        this.dangerId = dangerId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getProcessDes() {
-        return processDes;
-    }
-
-    public void setProcessDes(String processDes) {
-        this.processDes = processDes;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getProcessType() {
-        return processType;
-    }
-
-    public void setProcessType(String processType) {
-        this.processType = processType;
-    }
-
-    public Long getOwndeptid() {
-        return owndeptid;
-    }
-
-    public void setOwndeptid(Long owndeptid) {
-        this.owndeptid = owndeptid;
-    }
-
-    public String getTelphone() {
-        return telphone;
-    }
-
-    public void setTelphone(String telphone) {
-        this.telphone = telphone;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("dataStatus", getDataStatus())
-                .append("dangerId", getDangerId())
-                .append("userId", getUserId())
-                .append("userName", getUserName())
-                .append("processDes", getProcessDes())
-                .append("deptId", getDeptId())
-                .append("deptName", getDeptName())
-                .append("processType", getProcessType())
-                .append("owndeptid", getOwndeptid())
-                .toString();
-    }
-}

+ 0 - 10
src/main/java/com/sooka/sponest/event/emergency/dangerprocess/domain/DayBody.java

@@ -1,10 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerprocess.domain;
-
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import lombok.Data;
-
-@Data
-public class DayBody extends BaseBusinessEntity {
-
-    private String day;
-}

+ 0 - 63
src/main/java/com/sooka/sponest/event/emergency/dangerprocess/mapper/CentereventTEmergencyDangerprocessMapper.java

@@ -1,63 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerprocess.mapper;
-
-import com.sooka.sponest.event.emergency.dangerprocess.domain.CentereventTEmergencyDangerprocess;
-import com.sooka.sponest.event.emergency.dangerprocess.domain.DayBody;
-
-import java.util.List;
-
-/**
- * 隐患处理过程Mapper接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface CentereventTEmergencyDangerprocessMapper {
-
-    /**
-     * 查询隐患处理过程列表
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 隐患处理过程集合
-     */
-    List<CentereventTEmergencyDangerprocess> selectCentereventTEmergencyDangerprocessList(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess);
-
-    /**
-     * 查询隐患处理过程
-     *
-     * @param pkId 隐患处理过程主键
-     * @return 隐患处理过程
-     */
-    CentereventTEmergencyDangerprocess selectCentereventTEmergencyDangerprocessByPkId(String pkId);
-
-    /**
-     * 新增隐患处理过程
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 结果
-     */
-    int insertCentereventTEmergencyDangerprocess(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess);
-
-    /**
-     * 修改隐患处理过程
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 结果
-     */
-    int updateCentereventTEmergencyDangerprocess(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess);
-
-    /**
-     * 批量删除隐患处理过程
-     *
-     * @param pkIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteCentereventTEmergencyDangerprocessByPkIds(String[] pkIds);
-
-
-    /**
-     * 获取高危企业热点地图
-     * @param dayBody
-     * @return
-     */
-     List getHeatMap(DayBody dayBody);
-}

+ 0 - 65
src/main/java/com/sooka/sponest/event/emergency/dangerprocess/service/ICentereventTEmergencyDangerprocessService.java

@@ -1,65 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerprocess.service;
-
-import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
-import com.sooka.sponest.event.emergency.dangerprocess.domain.CentereventTEmergencyDangerprocess;
-import com.sooka.sponest.event.emergency.dangerprocess.domain.DayBody;
-
-import java.util.List;
-
-/**
- * 隐患处理过程Service接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface ICentereventTEmergencyDangerprocessService {
-
-    /**
-     * 查询隐患处理过程列表
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 隐患处理过程集合
-     */
-    List<CentereventTEmergencyDangerprocess> selectCentereventTEmergencyDangerprocessList(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess);
-
-    /**
-     * 查询隐患处理过程
-     *
-     * @param pkId 隐患处理过程主键
-     * @return 隐患处理过程
-     */
-    CentereventTEmergencyDangerprocess selectCentereventTEmergencyDangerprocessByPkId(String pkId);
-
-    /**
-     * 新增隐患处理过程
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 结果
-     */
-    int insertCentereventTEmergencyDangerprocess(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess);
-
-    int insertCentereventTEmergencyDangerprocess(CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    /**
-     * 修改隐患处理过程
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 结果
-     */
-    int updateCentereventTEmergencyDangerprocess(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess);
-
-    /**
-     * 批量删除隐患处理过程
-     *
-     * @param pkIds 需要删除的隐患处理过程主键集合
-     * @return 结果
-     */
-    int deleteCentereventTEmergencyDangerprocessByPkIds(String[] pkIds);
-
-    /**
-     * 获取经纬度热点地图
-     * @param dayBody
-     * @return
-     */
-    List getHeatMap(DayBody dayBody);
-}

+ 0 - 137
src/main/java/com/sooka/sponest/event/emergency/dangerprocess/service/impl/CentereventTEmergencyDangerprocessServiceImpl.java

@@ -1,137 +0,0 @@
-package com.sooka.sponest.event.emergency.dangerprocess.service.impl;
-
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
-import com.ruoyi.common.datascope.base.service.BaseService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
-import com.sooka.sponest.event.emergency.dangerprocess.domain.CentereventTEmergencyDangerprocess;
-import com.sooka.sponest.event.emergency.dangerprocess.domain.DayBody;
-import com.sooka.sponest.event.emergency.dangerprocess.mapper.CentereventTEmergencyDangerprocessMapper;
-import com.sooka.sponest.event.emergency.dangerprocess.service.ICentereventTEmergencyDangerprocessService;
-import com.sooka.sponest.event.utils.RemoteApiUtil;
-import org.apache.commons.collections4.MapUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 隐患处理过程Service业务层处理
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@Service
-public class CentereventTEmergencyDangerprocessServiceImpl extends BaseService implements ICentereventTEmergencyDangerprocessService {
-
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    private CentereventTEmergencyDangerprocessMapper centereventTEmergencyDangerprocessMapper;
-
-    /**
-     * 查询隐患处理过程列表
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 隐患处理过程
-     */
-    @Override
-    public List<CentereventTEmergencyDangerprocess> selectCentereventTEmergencyDangerprocessList(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        return centereventTEmergencyDangerprocessMapper.selectCentereventTEmergencyDangerprocessList(centereventTEmergencyDangerprocess);
-    }
-
-    /**
-     * 查询隐患处理过程
-     *
-     * @param pkId 隐患处理过程主键
-     * @return 隐患处理过程
-     */
-    @Override
-    public CentereventTEmergencyDangerprocess selectCentereventTEmergencyDangerprocessByPkId(String pkId) {
-        return centereventTEmergencyDangerprocessMapper.selectCentereventTEmergencyDangerprocessByPkId(pkId);
-    }
-
-    /**
-     * 新增隐患处理过程
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 结果
-     */
-    @Override
-    public int insertCentereventTEmergencyDangerprocess(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        centereventTEmergencyDangerprocess.setId(IdUtils.fastSimpleUUID());
-        centereventTEmergencyDangerprocess.setCreateBy(SecurityUtils.getUserId().toString());
-        centereventTEmergencyDangerprocess.setCreateTime(DateUtils.getNowDate());
-        int result = centereventTEmergencyDangerprocessMapper.insertCentereventTEmergencyDangerprocess(centereventTEmergencyDangerprocess);
-        if (result > 0) {
-            // 发送消息
-            RemoteApiUtil.getInstance().sendMessage(new HashSet<>(Arrays.asList(centereventTEmergencyDangerprocess.getTelphone())), "有安全隐患需要处理请查收", null, null);
-        }
-        return result;
-    }
-
-    @Override
-    public int insertCentereventTEmergencyDangerprocess(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess = new CentereventTEmergencyDangerprocess();
-        centereventTEmergencyDangerprocess.setDangerId(centereventTEmergencyDanger.getId());
-        centereventTEmergencyDangerprocess.setUserId(SecurityUtils.getUserId());
-        centereventTEmergencyDangerprocess.setUserName(SecurityUtils.getLoginUser().getSysUser().getNickName());
-        if ("trouble_status_2".equals(centereventTEmergencyDanger.getDangerStatus())) {
-            centereventTEmergencyDangerprocess.setProcessDes(SecurityUtils.getLoginUser().getSysUser().getNickName() + "申请" + centereventTEmergencyDanger.getDangerStatusLabel());
-        } else {
-            centereventTEmergencyDangerprocess.setProcessDes(SecurityUtils.getLoginUser().getSysUser().getNickName() + "申请" + centereventTEmergencyDanger.getDangerStatusLabel() + "。" + centereventTEmergencyDanger.getDangerContent());
-        }
-        centereventTEmergencyDangerprocess.setTelphone(centereventTEmergencyDanger.getTelphone());
-        return this.insertCentereventTEmergencyDangerprocess(centereventTEmergencyDangerprocess);
-    }
-
-    /**
-     * 修改隐患处理过程
-     *
-     * @param centereventTEmergencyDangerprocess 隐患处理过程
-     * @return 结果
-     */
-    @Override
-    public int updateCentereventTEmergencyDangerprocess(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        centereventTEmergencyDangerprocess.setUpdateTime(DateUtils.getNowDate());
-        return centereventTEmergencyDangerprocessMapper.updateCentereventTEmergencyDangerprocess(centereventTEmergencyDangerprocess);
-    }
-
-    /**
-     * 批量删除隐患处理过程
-     *
-     * @param pkIds 需要删除的隐患处理过程主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyDangerprocessByPkIds(String[] pkIds) {
-        return centereventTEmergencyDangerprocessMapper.deleteCentereventTEmergencyDangerprocessByPkIds(pkIds);
-    }
-
-    /**
-     * 热力地图
-     *
-     * @param dayBody
-     * @return
-     */
-    @DataScopeMutiDept(deptAlias = "c", userAlias = "e")
-    @Override
-    public List getHeatMap(DayBody dayBody) {
-        setSookaDataBase(dayBody);
-        List<Map> latLngs = centereventTEmergencyDangerprocessMapper.getHeatMap(dayBody);
-        List<Long> latLng;
-        List list = new ArrayList();
-        for (Map<String, Object> map : latLngs) {
-            latLng = new ArrayList<>();
-            latLng.add(MapUtils.getLong(map, "latitude"));
-            latLng.add(MapUtils.getLong(map, "longitude"));
-            latLng.add(1L);
-            list.add(latLng);
-        }
-        return list;
-    }
-}

+ 0 - 155
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/controller/CentereventTEmergencyInspectionrecordController.java

@@ -1,155 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.controller;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecordBdody;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecordBody;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.EmergencyInspectionrecordSelectBody;
-import com.sooka.sponest.event.emergency.inspectionrecord.mapper.CentereventTEmergencyInspectionrecordMapper;
-import com.sooka.sponest.event.emergency.inspectionrecord.service.ICentereventTEmergencyInspectionrecordService;
-import com.sooka.sponest.event.utils.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 巡检记录Controller
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@RestController
-@RequestMapping("/inspectionrecord")
-public class CentereventTEmergencyInspectionrecordController extends BaseController {
-
-    @Autowired
-    private ICentereventTEmergencyInspectionrecordService centereventTEmergencyInspectionrecordService;
-
-    @Autowired
-    CentereventTEmergencyInspectionrecordMapper centereventTEmergencyInspectionrecordMapper;
-
-    /**
-     * 查询巡检记录列表
-     */
-    @RequiresPermissions("inspectionrecord:inspectionrecord:list")
-    @GetMapping("/list")
-    public TableDataInfo list(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        startPage();
-        List<CentereventTEmergencyInspectionrecord> list = centereventTEmergencyInspectionrecordService.selectCentereventTEmergencyInspectionrecordList(centereventTEmergencyInspectionrecord);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询巡检记录列表(手机端)
-     */
-    @PostMapping("/appSelectRecord")
-    public R<List<CentereventTEmergencyInspectionrecord>> selectRecord(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        return R.ok(centereventTEmergencyInspectionrecordService.selectCentereventTEmergencyInspectionrecordList(centereventTEmergencyInspectionrecord));
-    }
-
-    /**
-     * 导出巡检记录列表
-     */
-    @RequiresPermissions("inspectionrecord:inspectionrecord:export")
-    @Log(title = "巡检记录", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        List<CentereventTEmergencyInspectionrecord> list = centereventTEmergencyInspectionrecordService.selectCentereventTEmergencyInspectionrecordList(centereventTEmergencyInspectionrecord);
-        ExcelUtil<CentereventTEmergencyInspectionrecord> util = new ExcelUtil<>(CentereventTEmergencyInspectionrecord.class);
-        util.exportExcel(response, list, "巡检记录数据");
-    }
-
-    /**
-     * 获取巡检记录详细信息
-     */
-//    @RequiresPermissions("inspectionrecord:inspectionrecord:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centereventTEmergencyInspectionrecordService.selectCentereventTEmergencyInspectionrecordById(id));
-    }
-
-    /**
-     * 新增巡检记录
-     */
-    @RequiresPermissions("inspectionrecord:inspectionrecord:add")
-    @Log(title = "巡检记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        return toAjax(centereventTEmergencyInspectionrecordService.insertCentereventTEmergencyInspectionrecord(centereventTEmergencyInspectionrecord));
-    }
-
-    @PostMapping("/insert")
-    public void insert(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        centereventTEmergencyInspectionrecordMapper.insertCentereventTEmergencyInspectionrecord(centereventTEmergencyInspectionrecord);
-    }
-
-    @PostMapping("addCordApp")
-    public AjaxResult addCordApp(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        return toAjax(centereventTEmergencyInspectionrecordService.insertCentereventTEmergencyInspectionrecord(centereventTEmergencyInspectionrecord));
-    }
-
-    /**
-     * 修改巡检记录
-     */
-    @RequiresPermissions("inspectionrecord:inspectionrecord:edit")
-    @Log(title = "巡检记录", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        return toAjax(centereventTEmergencyInspectionrecordService.updateCentereventTEmergencyInspectionrecord(centereventTEmergencyInspectionrecord));
-    }
-
-    @PostMapping("/updateInspectionrecord")
-    public void updateInspectionrecord(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        centereventTEmergencyInspectionrecordMapper.updateCentereventTEmergencyInspectionrecord(centereventTEmergencyInspectionrecord);
-    }
-
-    /**
-     * 删除巡检记录
-     */
-    @RequiresPermissions("inspectionrecord:inspectionrecord:remove")
-    @Log(title = "巡检记录", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids) {
-        return toAjax(centereventTEmergencyInspectionrecordService.deleteCentereventTEmergencyInspectionrecordByIds(ids));
-    }
-
-
-    @PostMapping("/insertCentereventTEmergencyInspectionrecordMessage")
-    public R insertCentereventTEmergencyInspectionrecordMessage(@RequestBody CentereventTEmergencyInspectionrecordBody list) {
-        CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord = centereventTEmergencyInspectionrecordService.insertCentereventTEmergencyInspectionrecordMessage(list.getList());
-        return R.ok(centereventTEmergencyInspectionrecord.getId());
-    }
-
-    /**
-     * 手机端巡查记录查询
-     *
-     * @param id
-     * @return
-     */
-    @PostMapping("/selectCentereventTEmergencyInspectionrecordMessageList")
-    public R selectCentereventTEmergencyInspectionrecordMessageList(@RequestBody CentereventTEmergencyInspectionrecordBdody id) {
-        EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody = new EmergencyInspectionrecordSelectBody();
-        emergencyInspectionrecordSelectBody.setId(id.getId());
-        List<CentereventTEmergencyInspectionrecordBdody> centereventTEmergencyInspectionrecord = centereventTEmergencyInspectionrecordService.selectCentereventTEmergencyInspectionrecordMessageList2(emergencyInspectionrecordSelectBody);
-        return R.ok(centereventTEmergencyInspectionrecord);
-    }
-
-    /**
-     * 获取应急工作情况
-     *
-     * @param emergencyInspectionrecordSelectBody
-     * @return
-     */
-    @GetMapping("/selectEmergencyList")
-    public AjaxResult selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody) {
-        return AjaxResult.success(centereventTEmergencyInspectionrecordService.selectEmergencyList(emergencyInspectionrecordSelectBody));
-    }
-}

+ 0 - 50
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/controller/EmergencyBigDataController.java

@@ -1,50 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.controller;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
-import com.sooka.sponest.event.emergency.inspectionrecord.service.IEmergencyBigDataService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-/*
-* 可视化大数据控制器
-*
-* @author 韩福成
-* @date 2025/2/5 上午11:17
-*/
-@RestController
-@RequestMapping("/emergencybigdata")
-public class EmergencyBigDataController extends BaseController {
-
-    @Autowired
-    private IEmergencyBigDataService emergencyBigDataService;
-
-    /**
-     * 巡检分析
-     */
-    @ApiOperation(value = "巡检分析",notes = "巡检分析")
-    @GetMapping("/getBigDataInspectionAnalysis")
-    public R<List<Map<String,Object>>> getBigDataInspectionAnalysis(CentereventTEmergencyInspectionrecord inspectionrecord){
-        return R.ok(emergencyBigDataService.getBigDataInspectionAnalysis(inspectionrecord));
-    }
-
-    /*
-    * 巡检内容分析
-    *
-    * @author 韩福成
-    * @date 2025/2/5 下午1:17
-    */
-    @ApiOperation(value = "巡检内容分析",notes = "巡检内容分析")
-    @GetMapping("/getBigDataInspectionContent")
-    public R<List<Map<String,Object>>> getBigDataInspectionContent(CentereventTEmergencyInspectionrecord inspectionrecord){
-        return R.ok(emergencyBigDataService.getBigDataInspectionContent(inspectionrecord));
-    }
-
-}

+ 0 - 9
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/AttachBean.java

@@ -1,9 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.domain;
-
-import lombok.Data;
-
-@Data
-public class AttachBean {
-    private String url;
-    private String webUrl;
-}

+ 0 - 249
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/CentereventTEmergencyInspectionrecord.java

@@ -1,249 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
-
-/**
- * 巡检记录对象 centerevent_t_emergency_inspectionrecord
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public class CentereventTEmergencyInspectionrecord extends BaseBusinessEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    private String id;
-
-    /**
-     * 删除人
-     */
-    private String deleteBy;
-
-    /**
-     * 删除时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date deleteTime;
-
-    /**
-     * 数据状态
-     */
-    private String dataStatus;
-
-    /**
-     * 被巡检企业
-     */
-    private String enterpriseId;
-
-    /**
-     * 企业名称
-     */
-    @Excel(name = "企业名称")
-    private String enterpriseName;
-
-    /**
-     * 巡检时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date inspectionTime;
-
-    /**
-     * 巡检人
-     */
-    private Long userId;
-
-    /**
-     * 巡检人名称
-     */
-    @Excel(name = "巡检人")
-    private String userName;
-
-    /**
-     * 是否有隐患(0-无 1-有)
-     */
-    @Excel(name = "是否有隐患", readConverterExp = "0=无,1=有")
-    private String isHavedanger;
-
-    /**
-     * 经度
-     */
-    @Excel(name = "经度")
-    private String longitude;
-
-    /**
-     * 纬度
-     */
-    @Excel(name = "纬度")
-    private String latitude;
-
-    /**
-     * 隐患ID
-     */
-    private String dangerId;
-
-    /**
-     * $column.columnComment
-     */
-    private Long owndeptid;
-
-    /**
-     * 数据所属部门(政或党的id)
-     */
-    private Long deptId;
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setDeleteBy(String deleteBy) {
-        this.deleteBy = deleteBy;
-    }
-
-    public String getDeleteBy() {
-        return deleteBy;
-    }
-
-    public void setDeleteTime(Date deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    public Date getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDataStatus(String dataStatus) {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDataStatus() {
-        return dataStatus;
-    }
-
-    public void setEnterpriseId(String enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseName(String enterpriseName) {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getEnterpriseName() {
-        return enterpriseName;
-    }
-
-    public void setInspectionTime(Date inspectionTime) {
-        this.inspectionTime = inspectionTime;
-    }
-
-    public Date getInspectionTime() {
-        return inspectionTime;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setIsHavedanger(String isHavedanger) {
-        this.isHavedanger = isHavedanger;
-    }
-
-    public String getIsHavedanger() {
-        return isHavedanger;
-    }
-
-    public void setDangerId(String dangerId) {
-        this.dangerId = dangerId;
-    }
-
-    public String getDangerId() {
-        return dangerId;
-    }
-
-    public void setOwndeptid(Long owndeptid) {
-        this.owndeptid = owndeptid;
-    }
-
-    public Long getOwndeptid() {
-        return owndeptid;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("deleteBy", getDeleteBy())
-                .append("deleteTime", getDeleteTime())
-                .append("dataStatus", getDataStatus())
-                .append("enterpriseId", getEnterpriseId())
-                .append("enterpriseName", getEnterpriseName())
-                .append("inspectionTime", getInspectionTime())
-                .append("userId", getUserId())
-                .append("userName", getUserName())
-                .append("longitude", getLongitude())
-                .append("latitude", getLatitude())
-                .append("isHavedanger", getIsHavedanger())
-                .append("dangerId", getDangerId())
-                .append("owndeptid", getOwndeptid())
-                .append("deptId", getDeptId())
-                .toString();
-    }
-}

+ 0 - 80
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/CentereventTEmergencyInspectionrecordBdody.java

@@ -1,80 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.domain;
-
-import com.ruoyi.common.core.annotation.Excel;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class CentereventTEmergencyInspectionrecordBdody {
-    /**
-     * 主键ID
-     */
-    private String id;
-
-    /**
-     * 数据所属部门(政或党的id)
-     */
-    @Excel(name = "数据所属部门(政或党的id)")
-    private Long dataDeptId;
-
-    /**
-     * 数据状态(1-可用 2-不可用 ) - 字典
-     */
-    @Excel(name = "数据状态(1-可用 2-不可用 ) - 字典")
-    private String dataStatus;
-
-    /**
-     * 项目名称
-     */
-    @Excel(name = "项目名称")
-    private String itemName;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String itemRemark;
-
-    /**
-     * 所属类型
-     */
-    @Excel(name = "所属类型")
-    private String imspectiontypeId;
-
-    /**
-     * 所属类型名称
-     */
-    @Excel(name = "所属类型名称")
-    private String imspectiontypeName;
-    /**
-     * 所属一级标题名称
-     */
-    private String imspectiontypefirstName;
-    /**
-     * 企业姓名
-     */
-    private String enterpriseName;
-    /**
-     * 企业id
-     */
-    private String enterpriseId;
-
-    private List<AttachBean> attachs = new ArrayList<>();
-    /**
-     * 备注
-     */
-    private String Content;
-    /**
-     * 用户名称
-     */
-    private String userName;
-    /**
-     * 用户id
-     */
-    private String UserId;
-
-    private  boolean inspectionitemCheck;
-
-}

+ 0 - 11
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/CentereventTEmergencyInspectionrecordBody.java

@@ -1,11 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.domain;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CentereventTEmergencyInspectionrecordBody {
-
-    private List<CentereventTEmergencyInspectionrecordBdody> list;
-}

+ 0 - 12
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/domain/EmergencyInspectionrecordSelectBody.java

@@ -1,12 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.domain;
-
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import lombok.Data;
-
-@Data
-public class EmergencyInspectionrecordSelectBody extends BaseBusinessEntity {
-
-    private String id;
-
-    private String userId;
-}

+ 0 - 70
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/mapper/CentereventTEmergencyInspectionrecordMapper.java

@@ -1,70 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.mapper;
-
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecordBdody;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.EmergencyInspectionrecordSelectBody;
-
-import java.util.List;
-
-/**
- * 巡检记录Mapper接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface CentereventTEmergencyInspectionrecordMapper
-{
-    /**
-     * 查询巡检记录
-     *
-     * @param id 巡检记录主键
-     * @return 巡检记录
-     */
-    public CentereventTEmergencyInspectionrecord selectCentereventTEmergencyInspectionrecordById(String id);
-
-    /**
-     * 查询巡检记录列表
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 巡检记录集合
-     */
-    public List<CentereventTEmergencyInspectionrecord> selectCentereventTEmergencyInspectionrecordList(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord);
-
-    /**
-     * 新增巡检记录
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 结果
-     */
-    public int insertCentereventTEmergencyInspectionrecord(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord);
-
-    /**
-     * 修改巡检记录
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 结果
-     */
-    public int updateCentereventTEmergencyInspectionrecord(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord);
-
-    /**
-     * 删除巡检记录
-     *
-     * @param id 巡检记录主键
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyInspectionrecordById(String id);
-
-    /**
-     * 批量删除巡检记录
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyInspectionrecordByIds(String[] ids);
-
-
-     public List<CentereventTEmergencyInspectionrecordBdody>  selectCentereventTEmergencyInspectionrecordMessageList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
-
-
-    public List  selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
-}

+ 0 - 22
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/mapper/EmergencyBigDataMapper.java

@@ -1,22 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.mapper;
-
-
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
-
-import java.util.List;
-import java.util.Map;
-
-public interface EmergencyBigDataMapper {
-
-
-    /**
-     * 巡检分析
-     */
-    List<Map<String, Object>> getBigDataInspectionAnalysis(CentereventTEmergencyInspectionrecord inspectionrecord);
-
-    /**
-     * 巡检内容分析
-     */
-    List<Map<String, Object>> getBigDataInspectionContent(CentereventTEmergencyInspectionrecord inspectionrecord);
-
-}

+ 0 - 75
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/ICentereventTEmergencyInspectionrecordService.java

@@ -1,75 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.service;
-
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecordBdody;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.EmergencyInspectionrecordSelectBody;
-
-import java.util.List;
-
-/**
- * 巡检记录Service接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface ICentereventTEmergencyInspectionrecordService
-{
-    /**
-     * 查询巡检记录
-     *
-     * @param id 巡检记录主键
-     * @return 巡检记录
-     */
-    public CentereventTEmergencyInspectionrecord selectCentereventTEmergencyInspectionrecordById(String id);
-
-    /**
-     * 查询巡检记录列表
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 巡检记录集合
-     */
-    public List<CentereventTEmergencyInspectionrecord> selectCentereventTEmergencyInspectionrecordList(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord);
-
-    /**
-     * 新增巡检记录
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 结果
-     */
-    public int insertCentereventTEmergencyInspectionrecord(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord);
-
-    /**
-     * 修改巡检记录
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 结果
-     */
-    public int updateCentereventTEmergencyInspectionrecord(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord);
-
-    /**
-     * 批量删除巡检记录
-     *
-     * @param ids 需要删除的巡检记录主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyInspectionrecordByIds(String[] ids);
-
-    /**
-     * 删除巡检记录信息
-     *
-     * @param id 巡检记录主键
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyInspectionrecordById(String id);
-
-    public CentereventTEmergencyInspectionrecord insertCentereventTEmergencyInspectionrecordMessage(List<CentereventTEmergencyInspectionrecordBdody> centereventTEmergencyInspectionrecordBdodyList);
-    public List<CentereventTEmergencyInspectionrecordBdody> selectCentereventTEmergencyInspectionrecordMessageList(String id);
-    public List<CentereventTEmergencyInspectionrecordBdody> selectCentereventTEmergencyInspectionrecordMessageList2(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
-
-    /**
-     * 获取部门应急工作情况
-     * @param emergencyInspectionrecordSelectBody
-     * @return
-     */
-    public List  selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
-}

+ 0 - 25
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/IEmergencyBigDataService.java

@@ -1,25 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.service;
-
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IEmergencyBigDataService {
-
-    /**
-     * 巡检分析
-     *
-     * @return
-     */
-    List<Map<String,Object>> getBigDataInspectionAnalysis(CentereventTEmergencyInspectionrecord inspectionrecord);
-
-    /*
-    * 巡检内容分析
-    *
-    * @author 韩福成
-    * @date 2025/2/5 下午1:19
-    */
-    List<Map<String,Object>> getBigDataInspectionContent(CentereventTEmergencyInspectionrecord inspectionrecord);
-
-}

+ 0 - 226
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/impl/CentereventTEmergencyInspectionrecordServiceImpl.java

@@ -1,226 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.service.impl;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
-import com.ruoyi.common.datascope.base.service.BaseService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.AttachBean;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecordBdody;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.EmergencyInspectionrecordSelectBody;
-import com.sooka.sponest.event.emergency.inspectionrecord.mapper.CentereventTEmergencyInspectionrecordMapper;
-import com.sooka.sponest.event.emergency.inspectionrecord.service.ICentereventTEmergencyInspectionrecordService;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetail;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.mapper.CentereventTEmergencyInspectionrecorddetailMapper;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyInspectionitem;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyInspectiontype;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 巡检记录Service业务层处理
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@Service
-public class CentereventTEmergencyInspectionrecordServiceImpl extends BaseService implements ICentereventTEmergencyInspectionrecordService {
-
-    @Autowired
-    private CentereventTEmergencyInspectionrecordMapper centereventTEmergencyInspectionrecordMapper;
-    @Autowired
-    private CentereventTEmergencyInspectionrecorddetailMapper centereventTEmergencyInspectionrecorddetailMapper;
-    @Autowired
-    private RemoteDataService remoteDataService;
-
-    /**
-     * 查询巡检记录
-     *
-     * @param id 巡检记录主键
-     * @return 巡检记录
-     */
-    @Override
-    public CentereventTEmergencyInspectionrecord selectCentereventTEmergencyInspectionrecordById(String id) {
-        return centereventTEmergencyInspectionrecordMapper.selectCentereventTEmergencyInspectionrecordById(id);
-    }
-
-    /**
-     * 查询巡检记录列表
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 巡检记录
-     */
-    @Override
-    public List<CentereventTEmergencyInspectionrecord> selectCentereventTEmergencyInspectionrecordList(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        return centereventTEmergencyInspectionrecordMapper.selectCentereventTEmergencyInspectionrecordList(centereventTEmergencyInspectionrecord);
-    }
-
-    /**
-     * 新增巡检记录
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 结果
-     */
-    @Override
-    public int insertCentereventTEmergencyInspectionrecord(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        centereventTEmergencyInspectionrecord.setCreateTime(DateUtils.getNowDate());
-        return centereventTEmergencyInspectionrecordMapper.insertCentereventTEmergencyInspectionrecord(centereventTEmergencyInspectionrecord);
-    }
-
-    /**
-     * 修改巡检记录
-     *
-     * @param centereventTEmergencyInspectionrecord 巡检记录
-     * @return 结果
-     */
-    @Override
-    public int updateCentereventTEmergencyInspectionrecord(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        centereventTEmergencyInspectionrecord.setUpdateTime(DateUtils.getNowDate());
-        return centereventTEmergencyInspectionrecordMapper.updateCentereventTEmergencyInspectionrecord(centereventTEmergencyInspectionrecord);
-    }
-
-    /**
-     * 批量删除巡检记录
-     *
-     * @param ids 需要删除的巡检记录主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyInspectionrecordByIds(String[] ids) {
-        return centereventTEmergencyInspectionrecordMapper.deleteCentereventTEmergencyInspectionrecordByIds(ids);
-    }
-
-    /**
-     * 删除巡检记录信息
-     *
-     * @param id 巡检记录主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyInspectionrecordById(String id) {
-        return centereventTEmergencyInspectionrecordMapper.deleteCentereventTEmergencyInspectionrecordById(id);
-    }
-
-    @Override
-    public CentereventTEmergencyInspectionrecord insertCentereventTEmergencyInspectionrecordMessage(List<CentereventTEmergencyInspectionrecordBdody> centereventTEmergencyInspectionrecordBdodyList) {
-        if (StringUtils.isEmpty(centereventTEmergencyInspectionrecordBdodyList)) {
-            return new CentereventTEmergencyInspectionrecord();
-        }
-        CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord = new CentereventTEmergencyInspectionrecord();
-        BeanUtils.copyProperties(centereventTEmergencyInspectionrecordBdodyList.get(0), centereventTEmergencyInspectionrecord);
-        centereventTEmergencyInspectionrecord.setCreateTime(DateUtils.getNowDate());
-        centereventTEmergencyInspectionrecord.setId(IdUtils.fastUUID());
-        centereventTEmergencyInspectionrecordBdodyList.forEach(centereventTEmergencyInspectionrecordBdody -> {
-            CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail = new CentereventTEmergencyInspectionrecorddetail();
-            centereventTEmergencyInspectionrecorddetail.setInspectionitemId(centereventTEmergencyInspectionrecordBdody.getId());
-            centereventTEmergencyInspectionrecorddetail.setInspectionitemName(centereventTEmergencyInspectionrecordBdody.getItemName());
-            centereventTEmergencyInspectionrecorddetail.setCreateTime(DateUtils.getNowDate());
-            centereventTEmergencyInspectionrecorddetail.setInspectionitemDesc(centereventTEmergencyInspectionrecordBdody.getContent());
-            centereventTEmergencyInspectionrecorddetail.setInspectionrecordId(centereventTEmergencyInspectionrecord.getId());
-            centereventTEmergencyInspectionrecorddetail.setCreateBy(centereventTEmergencyInspectionrecordBdody.getUserId());
-            centereventTEmergencyInspectionrecorddetail.setInspectionResult(String.valueOf((centereventTEmergencyInspectionrecordBdody.isInspectionitemCheck() ? 1 : 0)));
-            centereventTEmergencyInspectionrecorddetail.setId(IdUtils.fastUUID());
-            if (null != centereventTEmergencyInspectionrecordBdody.getAttachs()) {
-                centereventTEmergencyInspectionrecordBdody.getAttachs().forEach(attachBean -> {
-                    CenterdataTAttach centerdataTAttach = new CenterdataTAttach();
-                    centerdataTAttach.setAttachPath(attachBean.getWebUrl());
-                    centerdataTAttach.setBusSource("APP");
-                    centerdataTAttach.setFileName(attachBean.getUrl());
-                    centerdataTAttach.setBusId(centereventTEmergencyInspectionrecorddetail.getId());
-                    remoteDataService.insertAttach(centerdataTAttach);
-                });
-                centereventTEmergencyInspectionrecorddetail.setDataStatus("1");
-            }
-            centereventTEmergencyInspectionrecorddetailMapper.insertCentereventTEmergencyInspectionrecorddetail(centereventTEmergencyInspectionrecorddetail);
-        });
-        centereventTEmergencyInspectionrecord.setUserId(Long.parseLong(centereventTEmergencyInspectionrecordBdodyList.get(0).getUserId()));
-        centereventTEmergencyInspectionrecord.setUserName(centereventTEmergencyInspectionrecord.getUserName());
-        centereventTEmergencyInspectionrecord.setInspectionTime(DateUtils.getNowDate());
-        centereventTEmergencyInspectionrecord.setDataStatus("1");
-        centereventTEmergencyInspectionrecord.setEnterpriseId(centereventTEmergencyInspectionrecordBdodyList.get(0).getEnterpriseId());
-        centereventTEmergencyInspectionrecordMapper.insertCentereventTEmergencyInspectionrecord(centereventTEmergencyInspectionrecord);
-        return centereventTEmergencyInspectionrecord;
-    }
-
-    @Override
-    public List<CentereventTEmergencyInspectionrecordBdody> selectCentereventTEmergencyInspectionrecordMessageList(String id) {
-        CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail = new CentereventTEmergencyInspectionrecorddetail();
-        centereventTEmergencyInspectionrecorddetail.setInspectionrecordId(id);
-        List<CentereventTEmergencyInspectionrecorddetail> centereventTEmergencyInspectionrecorddetailList = centereventTEmergencyInspectionrecorddetailMapper.selectCentereventTEmergencyInspectionrecorddetailList(centereventTEmergencyInspectionrecorddetail);
-        List<CentereventTEmergencyInspectionrecordBdody> centereventTEmergencyInspectionrecordBdodyList = new ArrayList<>();
-        CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord = centereventTEmergencyInspectionrecordMapper.selectCentereventTEmergencyInspectionrecordById(id);
-        if (null != centereventTEmergencyInspectionrecorddetailList) {
-            centereventTEmergencyInspectionrecorddetailList.forEach(centereventTEmergencyInspectionrecorddetail1 -> {
-                CentereventTEmergencyInspectionrecordBdody centereventTEmergencyInspectionrecordBdody = new CentereventTEmergencyInspectionrecordBdody();
-                BeanUtils.copyProperties(centereventTEmergencyInspectionrecorddetail1, centereventTEmergencyInspectionrecordBdody);
-                centereventTEmergencyInspectionrecordBdody.setEnterpriseName(centereventTEmergencyInspectionrecord.getEnterpriseName());
-                centereventTEmergencyInspectionrecordBdody.setEnterpriseId(centereventTEmergencyInspectionrecord.getEnterpriseId());
-                R<List<CenterdataTAttach>> r = remoteDataService.urlAttch(centereventTEmergencyInspectionrecorddetail1.getId());
-                List<AttachBean> attachs = new ArrayList<>();
-                if (null != r.getData()) {
-                    r.getData().forEach(centerdataTAttach -> {
-                        AttachBean attachBean = new AttachBean();
-                        attachBean.setUrl(centerdataTAttach.getFileName());
-                        attachBean.setWebUrl(centerdataTAttach.getAttachPath());
-                        attachs.add(attachBean);
-                    });
-                }
-                centereventTEmergencyInspectionrecordBdody.setUserId(centereventTEmergencyInspectionrecord.getUserId().toString());
-                centereventTEmergencyInspectionrecordBdody.setUserName(centereventTEmergencyInspectionrecord.getUserName());
-                centereventTEmergencyInspectionrecordBdody.setAttachs(attachs);
-                if (null != centereventTEmergencyInspectionrecorddetail1.getInspectionResult()) {
-                    centereventTEmergencyInspectionrecordBdody.setInspectionitemCheck(centereventTEmergencyInspectionrecorddetail1.getInspectionResult().equals("1") ? true : false);
-                }
-                centereventTEmergencyInspectionrecordBdody.setItemName(centereventTEmergencyInspectionrecorddetail1.getInspectionitemName());
-                centereventTEmergencyInspectionrecordBdody.setImspectiontypeId(centereventTEmergencyInspectionrecorddetail1.getId());
-                R<CenterdataTEmergencyInspectionitem> centerdataTEmergencyInspectiontypeR = remoteDataService.getItemInfo(centereventTEmergencyInspectionrecorddetail1.getInspectionitemId());
-                if (null != centerdataTEmergencyInspectiontypeR.getData()) {
-                    centereventTEmergencyInspectionrecordBdody.setItemName(centerdataTEmergencyInspectiontypeR.getData().getImspectiontypeName());
-                    R<CenterdataTEmergencyInspectiontype> centerdataTEmergencyInspectiontypeR2 = remoteDataService.getTypeInfo(centerdataTEmergencyInspectiontypeR.getData().getImspectiontypeId());
-                    if (null != centerdataTEmergencyInspectiontypeR2.getData()) {
-                        centereventTEmergencyInspectionrecordBdody.setImspectiontypeName(centerdataTEmergencyInspectiontypeR2.getData().getInspectionName());
-                        R<CenterdataTEmergencyInspectiontype> centerdataTEmergencyInspectiontypeR3 = remoteDataService.getTypeInfo(centerdataTEmergencyInspectiontypeR2.getData().getParentId());
-                        if (null != centerdataTEmergencyInspectiontypeR3.getData()) {
-                            centereventTEmergencyInspectionrecordBdody.setImspectiontypefirstName(centerdataTEmergencyInspectiontypeR3.getData().getInspectionName());
-                        }
-                    }
-                }
-                centereventTEmergencyInspectionrecordBdodyList.add(centereventTEmergencyInspectionrecordBdody);
-            });
-        }
-        return centereventTEmergencyInspectionrecordBdodyList;
-    }
-
-    @Override
-    public List<CentereventTEmergencyInspectionrecordBdody> selectCentereventTEmergencyInspectionrecordMessageList2(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody) {
-        setSookaDataBase(emergencyInspectionrecordSelectBody);
-        List<CentereventTEmergencyInspectionrecordBdody> centereventTEmergencyInspectionrecordBdodyList = centereventTEmergencyInspectionrecordMapper.selectCentereventTEmergencyInspectionrecordMessageList(emergencyInspectionrecordSelectBody);
-        centereventTEmergencyInspectionrecordBdodyList.forEach(centereventTEmergencyInspectionrecordBdody -> {
-            R<List<CenterdataTAttach>> r = remoteDataService.urlAttch(centereventTEmergencyInspectionrecordBdody.getId());
-            r.getData().forEach(centerdataTAttach -> {
-                AttachBean attachBean = new AttachBean();
-                attachBean.setWebUrl(centerdataTAttach.getAttachPath());
-                attachBean.setUrl(centerdataTAttach.getFileName());
-                centereventTEmergencyInspectionrecordBdody.getAttachs().add(attachBean);
-            });
-        });
-        return centereventTEmergencyInspectionrecordBdodyList;
-    }
-
-    @DataScopeMutiDept(deptAlias = "d", userAlias = "u")
-    @Override
-    public List selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody) {
-        emergencyInspectionrecordSelectBody.setId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
-        setSookaDataBase(emergencyInspectionrecordSelectBody);
-        return centereventTEmergencyInspectionrecordMapper.selectEmergencyList(emergencyInspectionrecordSelectBody);
-    }
-}

+ 0 - 43
src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/impl/EmergencyBigDataServiceImpl.java

@@ -1,43 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecord.service.impl;
-
-import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
-import com.ruoyi.common.datascope.base.service.BaseService;
-import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
-import com.sooka.sponest.event.emergency.inspectionrecord.mapper.EmergencyBigDataMapper;
-import com.sooka.sponest.event.emergency.inspectionrecord.service.IEmergencyBigDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class EmergencyBigDataServiceImpl extends BaseService implements IEmergencyBigDataService {
-
-    @Autowired
-    private EmergencyBigDataMapper emergencyBigDataMapper;
-
-
-    /**
-     * 巡检分析
-     */
-    @DataScopeMutiDept(deptAlias = "d")
-    @Override
-    public List<Map<String, Object>> getBigDataInspectionAnalysis(CentereventTEmergencyInspectionrecord inspectionrecord) {
-        setSookaDataBase(inspectionrecord);
-        return emergencyBigDataMapper.getBigDataInspectionAnalysis(inspectionrecord);
-    }
-
-    /*
-    *  巡检内容分析
-    *
-    * @author 韩福成
-    * @date 2025/2/5 下午1:19
-    */
-    @DataScopeMutiDept(deptAlias = "d")
-    @Override
-    public List<Map<String, Object>> getBigDataInspectionContent(CentereventTEmergencyInspectionrecord inspectionrecord) {
-        setSookaDataBase(inspectionrecord);
-        return emergencyBigDataMapper.getBigDataInspectionContent(inspectionrecord);
-    }
-}

+ 0 - 118
src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/controller/CentereventTEmergencyInspectionrecorddetailController.java

@@ -1,118 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecorddetail.controller;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetail;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetailBody;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.mapper.CentereventTEmergencyInspectionrecorddetailMapper;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.service.ICentereventTEmergencyInspectionrecorddetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 巡检记录明细Controller
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@RestController
-@RequestMapping("/inspectionrecorddetail")
-public class CentereventTEmergencyInspectionrecorddetailController extends BaseController {
-    @Autowired
-    private ICentereventTEmergencyInspectionrecorddetailService centereventTEmergencyInspectionrecorddetailService;
-
-    @Autowired
-    CentereventTEmergencyInspectionrecorddetailMapper centereventTEmergencyInspectionrecorddetailMapper;
-
-    /**
-     * 查询巡检记录明细列表
-     */
-    @RequiresPermissions("inspectionrecorddetail:inspectionrecorddetail:list")
-    @GetMapping("/list")
-    public TableDataInfo list(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        startPage();
-        List<CentereventTEmergencyInspectionrecorddetail> list = centereventTEmergencyInspectionrecorddetailService.selectCentereventTEmergencyInspectionrecorddetailList(centereventTEmergencyInspectionrecorddetail);
-        return getDataTable(list);
-    }
-
-    @PostMapping("/selectDetail")
-    public R<List<CentereventTEmergencyInspectionrecorddetail>> selectDetail(@RequestBody CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        List<CentereventTEmergencyInspectionrecorddetail> list = centereventTEmergencyInspectionrecorddetailService.selectCentereventTEmergencyInspectionrecorddetailList(centereventTEmergencyInspectionrecorddetail);
-        return R.ok(list);
-    }
-
-    /**
-     * 导出巡检记录明细列表
-     */
-    @RequiresPermissions("inspectionrecorddetail:inspectionrecorddetail:export")
-    @Log(title = "巡检记录明细", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        List<CentereventTEmergencyInspectionrecorddetail> list = centereventTEmergencyInspectionrecorddetailService.selectCentereventTEmergencyInspectionrecorddetailList(centereventTEmergencyInspectionrecorddetail);
-        ExcelUtil<CentereventTEmergencyInspectionrecorddetail> util = new ExcelUtil<>(CentereventTEmergencyInspectionrecorddetail.class);
-        util.exportExcel(response, list, "巡检记录明细数据");
-    }
-
-    /**
-     * 获取巡检记录明细详细信息
-     */
-    @RequiresPermissions("inspectionrecorddetail:inspectionrecorddetail:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centereventTEmergencyInspectionrecorddetailService.selectCentereventTEmergencyInspectionrecorddetailById(id));
-    }
-
-    /**
-     * 新增巡检记录明细
-     */
-    @RequiresPermissions("inspectionrecorddetail:inspectionrecorddetail:add")
-    @Log(title = "巡检记录明细", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        return toAjax(centereventTEmergencyInspectionrecorddetailService.insertCentereventTEmergencyInspectionrecorddetail(centereventTEmergencyInspectionrecorddetail));
-    }
-
-    @PostMapping("/insertDetail")
-    public void insertDetail(@RequestBody CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        centereventTEmergencyInspectionrecorddetailMapper.insertCentereventTEmergencyInspectionrecorddetail(centereventTEmergencyInspectionrecorddetail);
-    }
-
-    /**
-     * 修改巡检记录明细
-     */
-    @RequiresPermissions("inspectionrecorddetail:inspectionrecorddetail:edit")
-    @Log(title = "巡检记录明细", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        return toAjax(centereventTEmergencyInspectionrecorddetailService.updateCentereventTEmergencyInspectionrecorddetail(centereventTEmergencyInspectionrecorddetail));
-    }
-
-    /**
-     * 删除巡检记录明细
-     */
-    @RequiresPermissions("inspectionrecorddetail:inspectionrecorddetail:remove")
-    @Log(title = "巡检记录明细", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids) {
-        return toAjax(centereventTEmergencyInspectionrecorddetailService.deleteCentereventTEmergencyInspectionrecorddetailByIds(ids));
-    }
-
-   @GetMapping("/selectAdoptionList")
-    public AjaxResult selectAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody) {
-        return AjaxResult.success(centereventTEmergencyInspectionrecorddetailService.selectAdoptionList(centereventTEmergencyInspectionrecorddetailBody));
-    }
-    @GetMapping("/selectHightAdoptionList")
-    public AjaxResult selectHightAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody) {
-        return AjaxResult.success(centereventTEmergencyInspectionrecorddetailService.selectHightAdoptionList(centereventTEmergencyInspectionrecorddetailBody));
-    }
-}
-

+ 0 - 185
src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/domain/CentereventTEmergencyInspectionrecorddetail.java

@@ -1,185 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecorddetail.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
-
-/**
- * 巡检记录明细对象 centerevent_t_emergency_inspectionrecorddetail
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public class CentereventTEmergencyInspectionrecorddetail extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String id;
-
-    /** 删除人 */
-    @Excel(name = "删除人")
-    private String deleteBy;
-
-    /** 删除时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deleteTime;
-
-    /** 数据状态 */
-    @Excel(name = "数据状态")
-    private String dataStatus;
-
-    /** 巡检记录id */
-    @Excel(name = "巡检记录id")
-    private String inspectionrecordId;
-
-    /** 巡检项目id */
-    @Excel(name = "巡检项目id")
-    private String inspectionitemId;
-
-    /** 巡检项目名称 */
-    @Excel(name = "巡检项目名称")
-    private String inspectionitemName;
-
-    /** 巡检结果(通过1,不通过0) */
-    @Excel(name = "巡检结果(通过1,不通过0)")
-    private String inspectionResult;
-
-    /** 巡检描述 */
-    @Excel(name = "巡检描述")
-    private String inspectionitemDesc;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long owndeptid;
-
-    /** 数据所属部门(政或党的id) */
-    @Excel(name = "数据所属部门(政或党的id)")
-    private Long deptId;
-
-    public void setId(String id)
-    {
-        this.id = id;
-    }
-
-    public String getId()
-    {
-        return id;
-    }
-    public void setDeleteBy(String deleteBy)
-    {
-        this.deleteBy = deleteBy;
-    }
-
-    public String getDeleteBy()
-    {
-        return deleteBy;
-    }
-    public void setDeleteTime(Date deleteTime)
-    {
-        this.deleteTime = deleteTime;
-    }
-
-    public Date getDeleteTime()
-    {
-        return deleteTime;
-    }
-    public void setDataStatus(String dataStatus)
-    {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDataStatus()
-    {
-        return dataStatus;
-    }
-    public void setInspectionrecordId(String inspectionrecordId)
-    {
-        this.inspectionrecordId = inspectionrecordId;
-    }
-
-    public String getInspectionrecordId()
-    {
-        return inspectionrecordId;
-    }
-    public void setInspectionitemId(String inspectionitemId)
-    {
-        this.inspectionitemId = inspectionitemId;
-    }
-
-    public String getInspectionitemId()
-    {
-        return inspectionitemId;
-    }
-    public void setInspectionitemName(String inspectionitemName)
-    {
-        this.inspectionitemName = inspectionitemName;
-    }
-
-    public String getInspectionitemName()
-    {
-        return inspectionitemName;
-    }
-    public void setInspectionResult(String inspectionResult)
-    {
-        this.inspectionResult = inspectionResult;
-    }
-
-    public String getInspectionResult()
-    {
-        return inspectionResult;
-    }
-    public void setInspectionitemDesc(String inspectionitemDesc)
-    {
-        this.inspectionitemDesc = inspectionitemDesc;
-    }
-
-    public String getInspectionitemDesc()
-    {
-        return inspectionitemDesc;
-    }
-    public void setOwndeptid(Long owndeptid)
-    {
-        this.owndeptid = owndeptid;
-    }
-
-    public Long getOwndeptid()
-    {
-        return owndeptid;
-    }
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("deleteBy", getDeleteBy())
-            .append("deleteTime", getDeleteTime())
-            .append("dataStatus", getDataStatus())
-            .append("inspectionrecordId", getInspectionrecordId())
-            .append("inspectionitemId", getInspectionitemId())
-            .append("inspectionitemName", getInspectionitemName())
-            .append("inspectionResult", getInspectionResult())
-            .append("inspectionitemDesc", getInspectionitemDesc())
-            .append("owndeptid", getOwndeptid())
-            .append("deptId", getDeptId())
-            .toString();
-    }
-}

+ 0 - 10
src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/domain/CentereventTEmergencyInspectionrecorddetailBody.java

@@ -1,10 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecorddetail.domain;
-
-import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import lombok.Data;
-
-@Data
-public class CentereventTEmergencyInspectionrecorddetailBody extends BaseBusinessEntity {
-
-    private String inspectionResult;
-}

+ 0 - 76
src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/mapper/CentereventTEmergencyInspectionrecorddetailMapper.java

@@ -1,76 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecorddetail.mapper;
-
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetail;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetailBody;
-
-import java.util.List;
-
-/**
- * 巡检记录明细Mapper接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface CentereventTEmergencyInspectionrecorddetailMapper
-{
-    /**
-     * 查询巡检记录明细
-     *
-     * @param id 巡检记录明细主键
-     * @return 巡检记录明细
-     */
-    public CentereventTEmergencyInspectionrecorddetail selectCentereventTEmergencyInspectionrecorddetailById(String id);
-
-    /**
-     * 查询巡检记录明细列表
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 巡检记录明细集合
-     */
-    public List<CentereventTEmergencyInspectionrecorddetail> selectCentereventTEmergencyInspectionrecorddetailList(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail);
-
-    /**
-     * 新增巡检记录明细
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 结果
-     */
-    public int insertCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail);
-
-    /**
-     * 修改巡检记录明细
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 结果
-     */
-    public int updateCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail);
-
-    /**
-     * 删除巡检记录明细
-     *
-     * @param id 巡检记录明细主键
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyInspectionrecorddetailById(String id);
-
-    /**
-     * 批量删除巡检记录明细
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyInspectionrecorddetailByIds(String[] ids);
-
-    /**
-     * 获取通不通过情况
-     * @return
-     */
-    public List selectAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody);
-
-    /**
-     * 获取高发不合格项
-     * @param centereventTEmergencyInspectionrecorddetailBody
-     * @return
-     */
-    public List selectHightAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody);
-}

+ 0 - 77
src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/service/ICentereventTEmergencyInspectionrecorddetailService.java

@@ -1,77 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecorddetail.service;
-
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetail;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetailBody;
-
-import java.util.List;
-
-/**
- * 巡检记录明细Service接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface ICentereventTEmergencyInspectionrecorddetailService
-{
-    /**
-     * 查询巡检记录明细
-     *
-     * @param id 巡检记录明细主键
-     * @return 巡检记录明细
-     */
-    public CentereventTEmergencyInspectionrecorddetail selectCentereventTEmergencyInspectionrecorddetailById(String id);
-
-    /**
-     * 查询巡检记录明细列表
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 巡检记录明细集合
-     */
-    public List<CentereventTEmergencyInspectionrecorddetail> selectCentereventTEmergencyInspectionrecorddetailList(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail);
-
-    /**
-     * 新增巡检记录明细
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 结果
-     */
-    public int insertCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail);
-
-    /**
-     * 修改巡检记录明细
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 结果
-     */
-    public int updateCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail);
-
-    /**
-     * 批量删除巡检记录明细
-     *
-     * @param ids 需要删除的巡检记录明细主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyInspectionrecorddetailByIds(String[] ids);
-
-    /**
-     * 删除巡检记录明细信息
-     *
-     * @param id 巡检记录明细主键
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyInspectionrecorddetailById(String id);
-
-    /**
-     * 获取通不通过情况
-     * @param centereventTEmergencyInspectionrecorddetailBody
-     * @return
-     */
-    public List selectAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody);
-
-    /**
-     * 获取高发不合格项
-     * @param centereventTEmergencyInspectionrecorddetailBody
-     * @return
-     */
-    public List selectHightAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody);
-}

+ 0 - 114
src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/service/impl/CentereventTEmergencyInspectionrecorddetailServiceImpl.java

@@ -1,114 +0,0 @@
-package com.sooka.sponest.event.emergency.inspectionrecorddetail.service.impl;
-
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
-import com.ruoyi.common.datascope.base.service.BaseService;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetail;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetailBody;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.mapper.CentereventTEmergencyInspectionrecorddetailMapper;
-import com.sooka.sponest.event.emergency.inspectionrecorddetail.service.ICentereventTEmergencyInspectionrecorddetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 巡检记录明细Service业务层处理
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@Service
-public class CentereventTEmergencyInspectionrecorddetailServiceImpl extends BaseService implements ICentereventTEmergencyInspectionrecorddetailService {
-
-    @Autowired
-    private CentereventTEmergencyInspectionrecorddetailMapper centereventTEmergencyInspectionrecorddetailMapper;
-
-    /**
-     * 查询巡检记录明细
-     *
-     * @param id 巡检记录明细主键
-     * @return 巡检记录明细
-     */
-    @Override
-    public CentereventTEmergencyInspectionrecorddetail selectCentereventTEmergencyInspectionrecorddetailById(String id) {
-        return centereventTEmergencyInspectionrecorddetailMapper.selectCentereventTEmergencyInspectionrecorddetailById(id);
-    }
-
-    /**
-     * 查询巡检记录明细列表
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 巡检记录明细
-     */
-    @Override
-    public List<CentereventTEmergencyInspectionrecorddetail> selectCentereventTEmergencyInspectionrecorddetailList(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        return centereventTEmergencyInspectionrecorddetailMapper.selectCentereventTEmergencyInspectionrecorddetailList(centereventTEmergencyInspectionrecorddetail);
-    }
-
-    /**
-     * 新增巡检记录明细
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 结果
-     */
-    @Override
-    public int insertCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        centereventTEmergencyInspectionrecorddetail.setCreateTime(DateUtils.getNowDate());
-        return centereventTEmergencyInspectionrecorddetailMapper.insertCentereventTEmergencyInspectionrecorddetail(centereventTEmergencyInspectionrecorddetail);
-    }
-
-    /**
-     * 修改巡检记录明细
-     *
-     * @param centereventTEmergencyInspectionrecorddetail 巡检记录明细
-     * @return 结果
-     */
-    @Override
-    public int updateCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
-        centereventTEmergencyInspectionrecorddetail.setUpdateTime(DateUtils.getNowDate());
-        return centereventTEmergencyInspectionrecorddetailMapper.updateCentereventTEmergencyInspectionrecorddetail(centereventTEmergencyInspectionrecorddetail);
-    }
-
-    /**
-     * 批量删除巡检记录明细
-     *
-     * @param ids 需要删除的巡检记录明细主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyInspectionrecorddetailByIds(String[] ids) {
-        return centereventTEmergencyInspectionrecorddetailMapper.deleteCentereventTEmergencyInspectionrecorddetailByIds(ids);
-    }
-
-    /**
-     * 删除巡检记录明细信息
-     *
-     * @param id 巡检记录明细主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyInspectionrecorddetailById(String id) {
-        return centereventTEmergencyInspectionrecorddetailMapper.deleteCentereventTEmergencyInspectionrecorddetailById(id);
-    }
-
-    /**
-     * 获取行业巡检通不通过详情
-     *
-     * @param centereventTEmergencyInspectionrecorddetailBody
-     * @return
-     */
-    @DataScopeMutiDept(deptAlias = "z", userAlias = "u")
-    @Override
-    public List selectAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody) {
-        setSookaDataBase(centereventTEmergencyInspectionrecorddetailBody);
-        return centereventTEmergencyInspectionrecorddetailMapper.selectAdoptionList(centereventTEmergencyInspectionrecorddetailBody);
-    }
-
-    @DataScopeMutiDept(deptAlias = "z", userAlias = "u")
-    @Override
-    public List selectHightAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody) {
-        setSookaDataBase(centereventTEmergencyInspectionrecorddetailBody);
-        return centereventTEmergencyInspectionrecorddetailMapper.selectHightAdoptionList(centereventTEmergencyInspectionrecorddetailBody);
-    }
-}

+ 0 - 108
src/main/java/com/sooka/sponest/event/emergency/patroloverdue/controller/CentereventTEmergencyPatroloverdueController.java

@@ -1,108 +0,0 @@
-package com.sooka.sponest.event.emergency.patroloverdue.controller;
-
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.sooka.sponest.event.emergency.patroloverdue.domain.CentereventTEmergencyPatroloverdue;
-import com.sooka.sponest.event.emergency.patroloverdue.service.ICentereventTEmergencyPatroloverdueService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 巡更逾期Controller
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@RestController
-@RequestMapping("/patroloverdue")
-public class CentereventTEmergencyPatroloverdueController extends BaseController
-{
-    @Autowired
-    private ICentereventTEmergencyPatroloverdueService centereventTEmergencyPatroloverdueService;
-
-    /**
-     * 查询巡更逾期列表
-     */
-    @RequiresPermissions("patroloverdue:patroloverdue:list")
-    @GetMapping("/list")
-    public TableDataInfo list(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
-    {
-        startPage();
-        List<CentereventTEmergencyPatroloverdue> list = centereventTEmergencyPatroloverdueService.selectCentereventTEmergencyPatroloverdueList(centereventTEmergencyPatroloverdue);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出巡更逾期列表
-     */
-    @RequiresPermissions("patroloverdue:patroloverdue:export")
-    @Log(title = "巡更逾期", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
-    {
-        List<CentereventTEmergencyPatroloverdue> list = centereventTEmergencyPatroloverdueService.selectCentereventTEmergencyPatroloverdueList(centereventTEmergencyPatroloverdue);
-        ExcelUtil<CentereventTEmergencyPatroloverdue> util = new ExcelUtil<>(CentereventTEmergencyPatroloverdue.class);
-        util.exportExcel(response, list, "巡更逾期数据");
-    }
-
-    /**
-     * 获取巡更逾期详细信息
-     */
-    @RequiresPermissions("patroloverdue:patroloverdue:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
-        return AjaxResult.success(centereventTEmergencyPatroloverdueService.selectCentereventTEmergencyPatroloverdueById(id));
-    }
-
-    /**
-     * 新增巡更逾期
-     */
-    @RequiresPermissions("patroloverdue:patroloverdue:add")
-    @Log(title = "巡更逾期", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
-    {
-        return toAjax(centereventTEmergencyPatroloverdueService.insertCentereventTEmergencyPatroloverdue(centereventTEmergencyPatroloverdue));
-    }
-
-
-    /**
-     * 新增巡更逾期
-     */
-    @PostMapping(value = "addPatroloverdue")
-    public AjaxResult addPatroloverdue(@RequestBody CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
-    {
-        return toAjax(centereventTEmergencyPatroloverdueService.insertCentereventTEmergencyPatroloverdue(centereventTEmergencyPatroloverdue));
-    }
-
-    /**
-     * 修改巡更逾期
-     */
-    @RequiresPermissions("patroloverdue:patroloverdue:edit")
-    @Log(title = "巡更逾期", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
-    {
-        return toAjax(centereventTEmergencyPatroloverdueService.updateCentereventTEmergencyPatroloverdue(centereventTEmergencyPatroloverdue));
-    }
-
-    /**
-     * 删除巡更逾期
-     */
-    @RequiresPermissions("patroloverdue:patroloverdue:remove")
-    @Log(title = "巡更逾期", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
-        return toAjax(centereventTEmergencyPatroloverdueService.deleteCentereventTEmergencyPatroloverdueByIds(ids));
-    }
-}

+ 0 - 187
src/main/java/com/sooka/sponest/event/emergency/patroloverdue/domain/CentereventTEmergencyPatroloverdue.java

@@ -1,187 +0,0 @@
-package com.sooka.sponest.event.emergency.patroloverdue.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
-
-/**
- * 巡更逾期对象 centerevent_t_emergency_patroloverdue
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public class CentereventTEmergencyPatroloverdue extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String id;
-
-    /** 删除人 */
-    @Excel(name = "删除人")
-    private String deleteBy;
-
-    /** 删除时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date deleteTime;
-
-    /** 数据状态 */
-    @Excel(name = "数据状态")
-    private String dataStatus;
-
-    /** 巡更点id */
-    @Excel(name = "巡更点id")
-    private String patrolpointId;
-
-    /** 巡更点名称 */
-    @Excel(name = "巡更点名称")
-    private String patrolpointName;
-
-    /** 巡更时间开始 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "巡更时间开始", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date patrolpointBegin;
-
-    /** 巡更时间结束 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "巡更时间结束", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date patrolpointEnd;
-
-    /** 超期时间(天) */
-    @Excel(name = "超期时间(天)")
-    private Long overdueDay;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private Long owndeptid;
-
-    /** 数据所属部门(政或党的id) */
-    @Excel(name = "数据所属部门(政或党的id)")
-    private Long deptId;
-
-    public void setId(String id)
-    {
-        this.id = id;
-    }
-
-    public String getId()
-    {
-        return id;
-    }
-    public void setDeleteBy(String deleteBy)
-    {
-        this.deleteBy = deleteBy;
-    }
-
-    public String getDeleteBy()
-    {
-        return deleteBy;
-    }
-    public void setDeleteTime(Date deleteTime)
-    {
-        this.deleteTime = deleteTime;
-    }
-
-    public Date getDeleteTime()
-    {
-        return deleteTime;
-    }
-    public void setDataStatus(String dataStatus)
-    {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDataStatus()
-    {
-        return dataStatus;
-    }
-    public void setPatrolpointId(String patrolpointId)
-    {
-        this.patrolpointId = patrolpointId;
-    }
-
-    public String getPatrolpointId()
-    {
-        return patrolpointId;
-    }
-    public void setPatrolpointName(String patrolpointName)
-    {
-        this.patrolpointName = patrolpointName;
-    }
-
-    public String getPatrolpointName()
-    {
-        return patrolpointName;
-    }
-    public void setPatrolpointBegin(Date patrolpointBegin)
-    {
-        this.patrolpointBegin = patrolpointBegin;
-    }
-
-    public Date getPatrolpointBegin()
-    {
-        return patrolpointBegin;
-    }
-    public void setPatrolpointEnd(Date patrolpointEnd)
-    {
-        this.patrolpointEnd = patrolpointEnd;
-    }
-
-    public Date getPatrolpointEnd()
-    {
-        return patrolpointEnd;
-    }
-    public void setOverdueDay(Long overdueDay)
-    {
-        this.overdueDay = overdueDay;
-    }
-
-    public Long getOverdueDay()
-    {
-        return overdueDay;
-    }
-    public void setOwndeptid(Long owndeptid)
-    {
-        this.owndeptid = owndeptid;
-    }
-
-    public Long getOwndeptid()
-    {
-        return owndeptid;
-    }
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("deleteBy", getDeleteBy())
-            .append("deleteTime", getDeleteTime())
-            .append("dataStatus", getDataStatus())
-            .append("patrolpointId", getPatrolpointId())
-            .append("patrolpointName", getPatrolpointName())
-            .append("patrolpointBegin", getPatrolpointBegin())
-            .append("patrolpointEnd", getPatrolpointEnd())
-            .append("overdueDay", getOverdueDay())
-            .append("owndeptid", getOwndeptid())
-            .append("deptId", getDeptId())
-            .toString();
-    }
-}

+ 0 - 62
src/main/java/com/sooka/sponest/event/emergency/patroloverdue/mapper/CentereventTEmergencyPatroloverdueMapper.java

@@ -1,62 +0,0 @@
-package com.sooka.sponest.event.emergency.patroloverdue.mapper;
-
-import com.sooka.sponest.event.emergency.patroloverdue.domain.CentereventTEmergencyPatroloverdue;
-
-import java.util.List;
-
-/**
- * 巡更逾期Mapper接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface CentereventTEmergencyPatroloverdueMapper
-{
-    /**
-     * 查询巡更逾期
-     *
-     * @param id 巡更逾期主键
-     * @return 巡更逾期
-     */
-    public CentereventTEmergencyPatroloverdue selectCentereventTEmergencyPatroloverdueById(String id);
-
-    /**
-     * 查询巡更逾期列表
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 巡更逾期集合
-     */
-    public List<CentereventTEmergencyPatroloverdue> selectCentereventTEmergencyPatroloverdueList(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue);
-
-    /**
-     * 新增巡更逾期
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 结果
-     */
-    public int insertCentereventTEmergencyPatroloverdue(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue);
-
-    /**
-     * 修改巡更逾期
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 结果
-     */
-    public int updateCentereventTEmergencyPatroloverdue(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue);
-
-    /**
-     * 删除巡更逾期
-     *
-     * @param id 巡更逾期主键
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyPatroloverdueById(String id);
-
-    /**
-     * 批量删除巡更逾期
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyPatroloverdueByIds(String[] ids);
-}

+ 0 - 62
src/main/java/com/sooka/sponest/event/emergency/patroloverdue/service/ICentereventTEmergencyPatroloverdueService.java

@@ -1,62 +0,0 @@
-package com.sooka.sponest.event.emergency.patroloverdue.service;
-
-import com.sooka.sponest.event.emergency.patroloverdue.domain.CentereventTEmergencyPatroloverdue;
-
-import java.util.List;
-
-/**
- * 巡更逾期Service接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface ICentereventTEmergencyPatroloverdueService
-{
-    /**
-     * 查询巡更逾期
-     *
-     * @param id 巡更逾期主键
-     * @return 巡更逾期
-     */
-    public CentereventTEmergencyPatroloverdue selectCentereventTEmergencyPatroloverdueById(String id);
-
-    /**
-     * 查询巡更逾期列表
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 巡更逾期集合
-     */
-    public List<CentereventTEmergencyPatroloverdue> selectCentereventTEmergencyPatroloverdueList(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue);
-
-    /**
-     * 新增巡更逾期
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 结果
-     */
-    public int insertCentereventTEmergencyPatroloverdue(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue);
-
-    /**
-     * 修改巡更逾期
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 结果
-     */
-    public int updateCentereventTEmergencyPatroloverdue(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue);
-
-    /**
-     * 批量删除巡更逾期
-     *
-     * @param ids 需要删除的巡更逾期主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyPatroloverdueByIds(String[] ids);
-
-    /**
-     * 删除巡更逾期信息
-     *
-     * @param id 巡更逾期主键
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyPatroloverdueById(String id);
-}

+ 0 - 97
src/main/java/com/sooka/sponest/event/emergency/patroloverdue/service/impl/CentereventTEmergencyPatroloverdueServiceImpl.java

@@ -1,97 +0,0 @@
-package com.sooka.sponest.event.emergency.patroloverdue.service.impl;
-
-import com.ruoyi.common.core.utils.DateUtils;
-import com.sooka.sponest.event.emergency.patroloverdue.domain.CentereventTEmergencyPatroloverdue;
-import com.sooka.sponest.event.emergency.patroloverdue.mapper.CentereventTEmergencyPatroloverdueMapper;
-import com.sooka.sponest.event.emergency.patroloverdue.service.ICentereventTEmergencyPatroloverdueService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 巡更逾期Service业务层处理
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@Service
-public class CentereventTEmergencyPatroloverdueServiceImpl implements ICentereventTEmergencyPatroloverdueService
-{
-    @Autowired
-    private CentereventTEmergencyPatroloverdueMapper centereventTEmergencyPatroloverdueMapper;
-
-    /**
-     * 查询巡更逾期
-     *
-     * @param id 巡更逾期主键
-     * @return 巡更逾期
-     */
-    @Override
-    public CentereventTEmergencyPatroloverdue selectCentereventTEmergencyPatroloverdueById(String id)
-    {
-        return centereventTEmergencyPatroloverdueMapper.selectCentereventTEmergencyPatroloverdueById(id);
-    }
-
-    /**
-     * 查询巡更逾期列表
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 巡更逾期
-     */
-    @Override
-    public List<CentereventTEmergencyPatroloverdue> selectCentereventTEmergencyPatroloverdueList(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
-    {
-        return centereventTEmergencyPatroloverdueMapper.selectCentereventTEmergencyPatroloverdueList(centereventTEmergencyPatroloverdue);
-    }
-
-    /**
-     * 新增巡更逾期
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 结果
-     */
-    @Override
-    public int insertCentereventTEmergencyPatroloverdue(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
-    {
-        centereventTEmergencyPatroloverdue.setCreateTime(DateUtils.getNowDate());
-        return centereventTEmergencyPatroloverdueMapper.insertCentereventTEmergencyPatroloverdue(centereventTEmergencyPatroloverdue);
-    }
-
-    /**
-     * 修改巡更逾期
-     *
-     * @param centereventTEmergencyPatroloverdue 巡更逾期
-     * @return 结果
-     */
-    @Override
-    public int updateCentereventTEmergencyPatroloverdue(CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
-    {
-        centereventTEmergencyPatroloverdue.setUpdateTime(DateUtils.getNowDate());
-        return centereventTEmergencyPatroloverdueMapper.updateCentereventTEmergencyPatroloverdue(centereventTEmergencyPatroloverdue);
-    }
-
-    /**
-     * 批量删除巡更逾期
-     *
-     * @param ids 需要删除的巡更逾期主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyPatroloverdueByIds(String[] ids)
-    {
-        return centereventTEmergencyPatroloverdueMapper.deleteCentereventTEmergencyPatroloverdueByIds(ids);
-    }
-
-    /**
-     * 删除巡更逾期信息
-     *
-     * @param id 巡更逾期主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyPatroloverdueById(String id)
-    {
-        return centereventTEmergencyPatroloverdueMapper.deleteCentereventTEmergencyPatroloverdueById(id);
-    }
-}

+ 0 - 149
src/main/java/com/sooka/sponest/event/emergency/patrolrecord/controller/CentereventTEmergencyPatrolrecordController.java

@@ -1,149 +0,0 @@
-package com.sooka.sponest.event.emergency.patrolrecord.controller;
-
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.sooka.sponest.event.emergency.patrolrecord.domain.CentereventTEmergencyPatrolrecord;
-import com.sooka.sponest.event.emergency.patrolrecord.mapper.CentereventTEmergencyPatrolrecordMapper;
-import com.sooka.sponest.event.emergency.patrolrecord.service.ICentereventTEmergencyPatrolrecordService;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyPatrolpoint;
-import com.sooka.sponest.event.utils.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 巡更记录Controller
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@RestController
-@RequestMapping("/patrolrecord")
-public class CentereventTEmergencyPatrolrecordController extends BaseController {
-
-    @Autowired
-    private ICentereventTEmergencyPatrolrecordService centereventTEmergencyPatrolrecordService;
-
-    @Autowired
-    CentereventTEmergencyPatrolrecordMapper centereventTEmergencyPatrolrecordMapper;
-
-    @Autowired
-    private RemoteDataService remoteDataService;
-
-    /**
-     * 查询巡更记录列表
-     */
-    @RequiresPermissions("patrolrecord:patrolrecord:list")
-    @GetMapping("/list")
-    public TableDataInfo list(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        startPage();
-        List<CentereventTEmergencyPatrolrecord> list = centereventTEmergencyPatrolrecordService.selectCentereventTEmergencyPatrolrecordList(centereventTEmergencyPatrolrecord);
-        return getDataTable(list);
-    }
-
-    @PostMapping("/listPatrolrecord")
-    public TableDataInfo listPatrolrecord(@RequestBody CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        startPage();
-        List<CentereventTEmergencyPatrolrecord> list = centereventTEmergencyPatrolrecordService.selectCentereventTEmergencyPatrolrecordList(centereventTEmergencyPatrolrecord);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出巡更记录列表
-     */
-    @RequiresPermissions("patrolrecord:patrolrecord:export")
-    @Log(title = "巡更记录", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        List<CentereventTEmergencyPatrolrecord> list = centereventTEmergencyPatrolrecordService.selectCentereventTEmergencyPatrolrecordList(centereventTEmergencyPatrolrecord);
-        ExcelUtil<CentereventTEmergencyPatrolrecord> util = new ExcelUtil<>(CentereventTEmergencyPatrolrecord.class);
-        util.exportExcel(response, list, "巡更记录数据");
-    }
-
-    /**
-     * 获取巡更记录详细信息
-     */
-//    @RequiresPermissions("patrolrecord:patrolrecord:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centereventTEmergencyPatrolrecordService.selectCentereventTEmergencyPatrolrecordById(id));
-    }
-
-    /**
-     * 新增巡更记录
-     */
-    @RequiresPermissions("patrolrecord:patrolrecord:add")
-    @Log(title = "巡更记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        return toAjax(centereventTEmergencyPatrolrecordService.insertCentereventTEmergencyPatrolrecord(centereventTEmergencyPatrolrecord));
-    }
-
-    @PostMapping(value = "addPatrolrecord")
-    public AjaxResult addPatrolrecord(@RequestBody CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        String barCode = centereventTEmergencyPatrolrecord.getPatrolpointId();
-        CenterdataTEmergencyPatrolpoint info = remoteDataService.findIPatrolpointByBarCode(barCode).getData();
-        if(info != null && StringUtils.isNotEmpty(info.getId())){
-            return toAjax(centereventTEmergencyPatrolrecordService.insertCentereventTEmergencyPatrolrecord(centereventTEmergencyPatrolrecord));
-        }else{
-            return AjaxResult.error("暂无条形码信息");
-        }
-    }
-
-    /**
-     * 修改巡更记录
-     */
-    @RequiresPermissions("patrolrecord:patrolrecord:edit")
-    @Log(title = "巡更记录", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        return toAjax(centereventTEmergencyPatrolrecordService.updateCentereventTEmergencyPatrolrecord(centereventTEmergencyPatrolrecord));
-    }
-
-    @PostMapping("/updatePatrolrecord")
-    public void updatePatrolrecord(@RequestBody CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        centereventTEmergencyPatrolrecordMapper.updateCentereventTEmergencyPatrolrecord(centereventTEmergencyPatrolrecord);
-    }
-
-    /**
-     * 删除巡更记录
-     */
-    @RequiresPermissions("patrolrecord:patrolrecord:remove")
-    @Log(title = "巡更记录", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids) {
-        return toAjax(centereventTEmergencyPatrolrecordService.deleteCentereventTEmergencyPatrolrecordByIds(ids));
-    }
-
-    /**
-     * 根据人员查询人员轨迹日期
-     * @Version 1.0
-     * @return
-     * @author wang_xy
-     * @since 2023/3/27 20:27
-     */
-    @GetMapping("/findItudeByUserId/{userId}")
-    public AjaxResult findItudeByUserId(@PathVariable("userId") String userId) {
-        return centereventTEmergencyPatrolrecordService.findItudeByUserId(userId);
-    }
-
-    /**
-     * 根据人员和时间段查询轨迹集合
-     * @Version 1.0
-     * @return
-     * @author wang_xy
-     * @since 2023/3/27 20:27
-     */
-    @GetMapping("/findItudeByUserIdAndTime/{userId}/{time}")
-    public AjaxResult findItudeByUserIdAndTime(@PathVariable("userId") String userId,@PathVariable("time") String time) {
-        return centereventTEmergencyPatrolrecordService.findItudeByUserIdAndTime(userId,time);
-    }
-}

+ 0 - 277
src/main/java/com/sooka/sponest/event/emergency/patrolrecord/domain/CentereventTEmergencyPatrolrecord.java

@@ -1,277 +0,0 @@
-package com.sooka.sponest.event.emergency.patrolrecord.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
-
-/**
- * 巡更记录对象 centerevent_t_emergency_patrolrecord
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public class CentereventTEmergencyPatrolrecord extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    private String id;
-
-    /**
-     * 删除人
-     */
-    private String deleteBy;
-
-    /**
-     * 删除时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date deleteTime;
-
-    /**
-     * 数据状态
-     */
-    private String dataStatus;
-
-    /**
-     * 巡更点ID
-     */
-    private String patrolpointId;
-
-    /**
-     * 巡更点名称
-     */
-    @Excel(name = "巡更点")
-    private String patrolpointName;
-
-    /**
-     * 巡更点地址
-     */
-    private String patrolpointAddress;
-
-    /**
-     * 巡更时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "巡更时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date patrolTime;
-
-    /**
-     * 巡更人
-     */
-    private Long userId;
-
-    /**
-     * 巡更人姓名
-     */
-    @Excel(name = "巡更人")
-    private String userName;
-
-    /**
-     * 经度
-     */
-    @Excel(name = "经度")
-    private String longitude;
-
-    /**
-     * 纬度
-     */
-    @Excel(name = "纬度")
-    private String latitude;
-
-    /**
-     * 巡更插入状态(正常插入、超期插入)
-     */
-    @Excel(name = "巡更插入状态", readConverterExp = "patrol_type1=正常插入,patrol_type2=超期插入")
-    private String patrolInserttype;
-
-    /**
-     * 是否有隐患(0-没有,1-有)
-     */
-    @Excel(name = "是否有隐患", readConverterExp = "0=无,1=有")
-    private String isHavedanger;
-
-    /**
-     * 隐患iD
-     */
-    private String dangerId;
-
-    /**
-     * $column.columnComment
-     */
-    private Long owndeptid;
-
-    /**
-     * 数据所属部门(政或党的id)
-     */
-    private Long deptId;
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setDeleteBy(String deleteBy) {
-        this.deleteBy = deleteBy;
-    }
-
-    public String getDeleteBy() {
-        return deleteBy;
-    }
-
-    public void setDeleteTime(Date deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    public Date getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDataStatus(String dataStatus) {
-        this.dataStatus = dataStatus;
-    }
-
-    public String getDataStatus() {
-        return dataStatus;
-    }
-
-    public void setPatrolpointId(String patrolpointId) {
-        this.patrolpointId = patrolpointId;
-    }
-
-    public String getPatrolpointId() {
-        return patrolpointId;
-    }
-
-    public void setPatrolpointName(String patrolpointName) {
-        this.patrolpointName = patrolpointName;
-    }
-
-    public String getPatrolpointName() {
-        return patrolpointName;
-    }
-
-    public void setPatrolpointAddress(String patrolpointAddress) {
-        this.patrolpointAddress = patrolpointAddress;
-    }
-
-    public String getPatrolpointAddress() {
-        return patrolpointAddress;
-    }
-
-    public void setPatrolTime(Date patrolTime) {
-        this.patrolTime = patrolTime;
-    }
-
-    public Date getPatrolTime() {
-        return patrolTime;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setPatrolInserttype(String patrolInserttype) {
-        this.patrolInserttype = patrolInserttype;
-    }
-
-    public String getPatrolInserttype() {
-        return patrolInserttype;
-    }
-
-    public void setIsHavedanger(String isHavedanger) {
-        this.isHavedanger = isHavedanger;
-    }
-
-    public String getIsHavedanger() {
-        return isHavedanger;
-    }
-
-    public void setDangerId(String dangerId) {
-        this.dangerId = dangerId;
-    }
-
-    public String getDangerId() {
-        return dangerId;
-    }
-
-    public void setOwndeptid(Long owndeptid) {
-        this.owndeptid = owndeptid;
-    }
-
-    public Long getOwndeptid() {
-        return owndeptid;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("deleteBy", getDeleteBy())
-                .append("deleteTime", getDeleteTime())
-                .append("dataStatus", getDataStatus())
-                .append("patrolpointId", getPatrolpointId())
-                .append("patrolpointName", getPatrolpointName())
-                .append("patrolpointAddress", getPatrolpointAddress())
-                .append("patrolTime", getPatrolTime())
-                .append("userId", getUserId())
-                .append("userName", getUserName())
-                .append("longitude", getLongitude())
-                .append("latitude", getLatitude())
-                .append("patrolInserttype", getPatrolInserttype())
-                .append("isHavedanger", getIsHavedanger())
-                .append("dangerId", getDangerId())
-                .append("owndeptid", getOwndeptid())
-                .append("deptId", getDeptId())
-                .toString();
-    }
-}

+ 0 - 77
src/main/java/com/sooka/sponest/event/emergency/patrolrecord/mapper/CentereventTEmergencyPatrolrecordMapper.java

@@ -1,77 +0,0 @@
-package com.sooka.sponest.event.emergency.patrolrecord.mapper;
-
-import com.sooka.sponest.event.emergency.patrolrecord.domain.CentereventTEmergencyPatrolrecord;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 巡更记录Mapper接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface CentereventTEmergencyPatrolrecordMapper
-{
-    /**
-     * 查询巡更记录
-     *
-     * @param id 巡更记录主键
-     * @return 巡更记录
-     */
-    public CentereventTEmergencyPatrolrecord selectCentereventTEmergencyPatrolrecordById(String id);
-
-    /**
-     * 查询巡更记录列表
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 巡更记录集合
-     */
-    public List<CentereventTEmergencyPatrolrecord> selectCentereventTEmergencyPatrolrecordList(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord);
-
-    /**
-     * 新增巡更记录
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 结果
-     */
-    public int insertCentereventTEmergencyPatrolrecord(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord);
-
-    /**
-     * 修改巡更记录
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 结果
-     */
-    public int updateCentereventTEmergencyPatrolrecord(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord);
-
-    /**
-     * 删除巡更记录
-     *
-     * @param id 巡更记录主键
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyPatrolrecordById(String id);
-
-    /**
-     * 批量删除巡更记录
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyPatrolrecordByIds(String[] ids);
-
-    /**
-     * 查询最新记录
-     *
-     * @return 结果
-     */
-    public CentereventTEmergencyPatrolrecord getCentereventTEmergencyPatrolrecordNewData(String patrolpointId);
-
-
-    List<Map<String,String>> findItudeByUserId(String userId);
-
-
-    List<Map<String,String>> findItudeByUserIdAndTime(@Param("userId") String userId, @Param("time") String time);
-}

+ 0 - 67
src/main/java/com/sooka/sponest/event/emergency/patrolrecord/service/ICentereventTEmergencyPatrolrecordService.java

@@ -1,67 +0,0 @@
-package com.sooka.sponest.event.emergency.patrolrecord.service;
-
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.event.emergency.patrolrecord.domain.CentereventTEmergencyPatrolrecord;
-
-import java.util.List;
-
-/**
- * 巡更记录Service接口
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-public interface ICentereventTEmergencyPatrolrecordService
-{
-    /**
-     * 查询巡更记录
-     *
-     * @param id 巡更记录主键
-     * @return 巡更记录
-     */
-    public CentereventTEmergencyPatrolrecord selectCentereventTEmergencyPatrolrecordById(String id);
-
-    /**
-     * 查询巡更记录列表
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 巡更记录集合
-     */
-    public List<CentereventTEmergencyPatrolrecord> selectCentereventTEmergencyPatrolrecordList(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord);
-
-    /**
-     * 新增巡更记录
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 结果
-     */
-    public int insertCentereventTEmergencyPatrolrecord(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord);
-
-    /**
-     * 修改巡更记录
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 结果
-     */
-    public int updateCentereventTEmergencyPatrolrecord(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord);
-
-    /**
-     * 批量删除巡更记录
-     *
-     * @param ids 需要删除的巡更记录主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyPatrolrecordByIds(String[] ids);
-
-    /**
-     * 删除巡更记录信息
-     *
-     * @param id 巡更记录主键
-     * @return 结果
-     */
-    public int deleteCentereventTEmergencyPatrolrecordById(String id);
-
-
-    AjaxResult findItudeByUserId(String userId);
-    AjaxResult findItudeByUserIdAndTime(String userId,String time);
-}

+ 0 - 133
src/main/java/com/sooka/sponest/event/emergency/patrolrecord/service/impl/CentereventTEmergencyPatrolrecordServiceImpl.java

@@ -1,133 +0,0 @@
-package com.sooka.sponest.event.emergency.patrolrecord.service.impl;
-
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.event.emergency.patrolrecord.domain.CentereventTEmergencyPatrolrecord;
-import com.sooka.sponest.event.emergency.patrolrecord.mapper.CentereventTEmergencyPatrolrecordMapper;
-import com.sooka.sponest.event.emergency.patrolrecord.service.ICentereventTEmergencyPatrolrecordService;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyPatrolpoint;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * 巡更记录Service业务层处理
- *
- * @author ruoyi
- * @date 2022-07-20
- */
-@Service
-public class CentereventTEmergencyPatrolrecordServiceImpl implements ICentereventTEmergencyPatrolrecordService {
-    @Autowired
-    private CentereventTEmergencyPatrolrecordMapper centereventTEmergencyPatrolrecordMapper;
-
-    @Autowired
-    private RemoteDataService remoteDataService;
-
-    /**
-     * 查询巡更记录
-     *
-     * @param id 巡更记录主键
-     * @return 巡更记录
-     */
-    @Override
-    public CentereventTEmergencyPatrolrecord selectCentereventTEmergencyPatrolrecordById(String id) {
-        return centereventTEmergencyPatrolrecordMapper.selectCentereventTEmergencyPatrolrecordById(id);
-    }
-
-    /**
-     * 查询巡更记录列表
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 巡更记录
-     */
-    @Override
-    public List<CentereventTEmergencyPatrolrecord> selectCentereventTEmergencyPatrolrecordList(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        return centereventTEmergencyPatrolrecordMapper.selectCentereventTEmergencyPatrolrecordList(centereventTEmergencyPatrolrecord);
-    }
-
-    /**
-     * 新增巡更记录
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 结果
-     */
-    @Override
-    public int insertCentereventTEmergencyPatrolrecord(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-
-        //根据条码获取绑定的详情信息并赋值到巡更记录中
-        String barCode = centereventTEmergencyPatrolrecord.getPatrolpointId();
-        CenterdataTEmergencyPatrolpoint info = remoteDataService.findIPatrolpointByBarCode(barCode).getData();
-        centereventTEmergencyPatrolrecord.setPatrolpointId(info.getId());
-        centereventTEmergencyPatrolrecord.setPatrolpointName(info.getPatrolpointName());
-        centereventTEmergencyPatrolrecord.setPatrolpointAddress(info.getPatrolpointAddress());
-        centereventTEmergencyPatrolrecord.setLongitude(info.getLongitude());
-        centereventTEmergencyPatrolrecord.setLatitude(info.getLatitude());
-        centereventTEmergencyPatrolrecord.setPatrolInserttype("0");
-
-        //获取巡更记录最后一条
-        CentereventTEmergencyPatrolrecord newData = centereventTEmergencyPatrolrecordMapper.getCentereventTEmergencyPatrolrecordNewData(info.getId());
-        if (newData != null) {
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(newData.getPatrolTime());
-            calendar.add(Calendar.DATE, info.getPatrolCycle().intValue());
-            if (new Date().compareTo(calendar.getTime()) > 0) {
-                centereventTEmergencyPatrolrecord.setPatrolInserttype("1");
-            }
-        }
-        centereventTEmergencyPatrolrecord.setIsHavedanger("0");
-        centereventTEmergencyPatrolrecord.setId(UUID.randomUUID().toString());
-        centereventTEmergencyPatrolrecord.setCreateTime(DateUtils.getNowDate());
-        centereventTEmergencyPatrolrecord.setPatrolTime(DateUtils.getNowDate());
-        return centereventTEmergencyPatrolrecordMapper.insertCentereventTEmergencyPatrolrecord(centereventTEmergencyPatrolrecord);
-    }
-
-    /**
-     * 修改巡更记录
-     *
-     * @param centereventTEmergencyPatrolrecord 巡更记录
-     * @return 结果
-     */
-    @Override
-    public int updateCentereventTEmergencyPatrolrecord(CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord) {
-        centereventTEmergencyPatrolrecord.setUpdateTime(DateUtils.getNowDate());
-        return centereventTEmergencyPatrolrecordMapper.updateCentereventTEmergencyPatrolrecord(centereventTEmergencyPatrolrecord);
-    }
-
-    /**
-     * 批量删除巡更记录
-     *
-     * @param ids 需要删除的巡更记录主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyPatrolrecordByIds(String[] ids) {
-        return centereventTEmergencyPatrolrecordMapper.deleteCentereventTEmergencyPatrolrecordByIds(ids);
-    }
-
-    /**
-     * 删除巡更记录信息
-     *
-     * @param id 巡更记录主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEmergencyPatrolrecordById(String id) {
-        return centereventTEmergencyPatrolrecordMapper.deleteCentereventTEmergencyPatrolrecordById(id);
-    }
-
-    @Override
-    public AjaxResult findItudeByUserId(String userId) {
-        return AjaxResult.success(centereventTEmergencyPatrolrecordMapper.findItudeByUserId(userId));
-    }
-
-    @Override
-    public AjaxResult findItudeByUserIdAndTime(String userId, String time) {
-        return AjaxResult.success(centereventTEmergencyPatrolrecordMapper.findItudeByUserIdAndTime(userId, time));
-    }
-}

+ 0 - 172
src/main/resources/mapper/emergency/danger/CentereventTEmergencyDangerMapper.xml

@@ -1,172 +0,0 @@
-<?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.sooka.sponest.event.emergency.danger.mapper.CentereventTEmergencyDangerMapper">
-
-    <resultMap type="CentereventTEmergencyDanger" id="CentereventTEmergencyDangerResult">
-        <result property="id" column="id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="dataDeptId" column="data_dept_id"/>
-        <result property="dataStatus" column="data_status"/>
-        <result property="longitude" column="longitude"/>
-        <result property="latitude" column="latitude"/>
-        <result property="dangerStatus" column="danger_status"/>
-        <result property="dangerTitle" column="danger_title"/>
-        <result property="dangerContent" column="danger_content"/>
-        <result property="enterpriseId" column="enterprise_id"/>
-        <result property="enterpriseName" column="enterprise_name"/>
-        <result property="dangerAddress" column="danger_address"/>
-        <result property="dangerSource" column="danger_source"/>
-        <result property="dangerReport" column="danger_report"/>
-        <result property="isupyjj" column="isupyjj"/>
-    </resultMap>
-
-    <sql id="selectCentereventTEmergencyDangerVo">
-        select id, create_by, create_time, update_by, update_time, data_dept_id, data_status, longitude, latitude, danger_status, danger_title, danger_content, enterprise_id, enterprise_name, danger_address, danger_source, danger_report, isupyjj from centerevent_t_emergency_danger
-    </sql>
-
-    <select id="selectCentereventTEmergencyDangerList" parameterType="CentereventTEmergencyDanger"
-            resultMap="CentereventTEmergencyDangerResult">
-        select a.*,dict.dict_label dangerStatusLabel from centerevent_t_emergency_danger a
-        left join centerevent_t_emergency_dangerdeptmap b on b.danger_id = a.id
-        left join ${database_system}.sys_dept d on d.dept_id = b.dept_id
-        left join ${database_system}.sys_dict_data dict on dict.dict_type = 'emergency_trouble_status' and
-        dict.dict_value = a.danger_status
-        <where>
-            <if test="createDate != null and createDate != ''">
-                and DATE_FORMAT(a.create_time,'%Y-%m-%d') = #{createDate}
-            </if>
-            <if test="dangerTitle != null and dangerTitle != ''">and danger_title = #{dangerTitle}</if>
-            <if test="dangerContent != null and dangerContent != ''">and danger_content = #{dangerContent}</if>
-            <if test="enterpriseId != null and enterpriseId != ''">and enterprise_id = #{enterpriseId}</if>
-            <if test="enterpriseName != null and enterpriseName != ''">
-                and enterprise_name like concat('%', #{enterpriseName}, '%')
-            </if>
-            <if test="dangerAddress != null and dangerAddress != ''">and danger_address = #{dangerAddress}</if>
-            <if test="dangerSource != null and dangerSource != ''">and danger_source = #{dangerSource}</if>
-            <if test="dangerStatus != null and dangerStatus != ''">and danger_status = #{dangerStatus}</if>
-        </where>
-        group by a.id
-        ORDER BY
-        a.create_time DESC
-
-    </select>
-
-    <select id="selectCentereventTEmergencyDangerById" parameterType="String"
-            resultMap="CentereventTEmergencyDangerResult">
-        <include refid="selectCentereventTEmergencyDangerVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertCentereventTEmergencyDanger" parameterType="CentereventTEmergencyDanger">
-        insert into centerevent_t_emergency_danger
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="dataDeptId != null">data_dept_id,</if>
-            <if test="dataStatus != null">data_status,</if>
-            <if test="longitude != null">longitude,</if>
-            <if test="latitude != null">latitude,</if>
-            <if test="dangerStatus != null">danger_status,</if>
-            <if test="dangerTitle != null">danger_title,</if>
-            <if test="dangerContent != null">danger_content,</if>
-            <if test="enterpriseId != null">enterprise_id,</if>
-            <if test="enterpriseName != null">enterprise_name,</if>
-            <if test="dangerAddress != null">danger_address,</if>
-            <if test="dangerSource != null">danger_source,</if>
-            <if test="dangerReport != null">danger_report,</if>
-            <if test="isupyjj != null">isupyjj,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="dataDeptId != null">#{dataDeptId},</if>
-            <if test="dataStatus != null">#{dataStatus},</if>
-            <if test="longitude != null">#{longitude},</if>
-            <if test="latitude != null">#{latitude},</if>
-            <if test="dangerStatus != null">#{dangerStatus},</if>
-            <if test="dangerTitle != null">#{dangerTitle},</if>
-            <if test="dangerContent != null">#{dangerContent},</if>
-            <if test="enterpriseId != null">#{enterpriseId},</if>
-            <if test="enterpriseName != null">#{enterpriseName},</if>
-            <if test="dangerAddress != null">#{dangerAddress},</if>
-            <if test="dangerSource != null">#{dangerSource},</if>
-            <if test="dangerReport != null">#{dangerReport},</if>
-            <if test="isupyjj != null">#{isupyjj},</if>
-        </trim>
-    </insert>
-
-    <update id="updateCentereventTEmergencyDanger" parameterType="CentereventTEmergencyDanger">
-        update centerevent_t_emergency_danger
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="dataDeptId != null">data_dept_id = #{dataDeptId},</if>
-            <if test="dataStatus != null">data_status = #{dataStatus},</if>
-            <if test="longitude != null">longitude = #{longitude},</if>
-            <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="dangerStatus != null">danger_status = #{dangerStatus},</if>
-            <if test="dangerTitle != null">danger_title = #{dangerTitle},</if>
-            <if test="dangerContent != null">danger_content = #{dangerContent},</if>
-            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
-            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
-            <if test="dangerAddress != null">danger_address = #{dangerAddress},</if>
-            <if test="dangerSource != null">danger_source = #{dangerSource},</if>
-            <if test="dangerReport != null">danger_report = #{dangerReport},</if>
-            <if test="isupyjj != null">isupyjj = #{isupyjj},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCentereventTEmergencyDangerByIds" parameterType="String">
-        delete from centerevent_t_emergency_danger where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="selectDangerByCalendar" parameterType="CentereventTEmergencyDanger" resultType="map">
-        select day,count(*) daycount from (
-        select id,DATE_FORMAT(a.create_time,'%Y-%m-%d') day
-        from centerevent_t_emergency_danger a
-        left join centerevent_t_emergency_dangerdeptmap b on b.danger_id = a.id
-        left join ${database_system}.sys_dept d on d.dept_id = b.dept_id
-        <where>
-            <if test="createDate != null and createDate != ''">
-                and DATE_FORMAT(a.create_time,'%Y-%m-%d') = #{createDate}
-            </if>
-            ${params.dataScope}
-        </where>
-        group by a.id) t
-        group by day
-    </select>
-
-    <select id="selectStatsMap" parameterType="CentereventTEmergencyDanger" resultType="java.util.Map">
-      SELECT
-	dict.dict_label AS NAME,
-	COUNT( a.id ) AS
-VALUE
-
-FROM
-	onest_event.centerevent_t_emergency_danger a
-
-	RIGHT JOIN onest_system.sys_dict_data dict ON dict.dict_type = 'emergency_trouble_status'
-	AND dict.dict_value = a.danger_status
-WHERE
-	dict.`status` = 0 AND dict.dict_type = 'emergency_trouble_status'
-GROUP BY
-	a.danger_status
-    </select>
-</mapper>

+ 0 - 107
src/main/resources/mapper/emergency/dangerdeptmap/CentereventTEmergencyDangerdeptmapMapper.xml

@@ -1,107 +0,0 @@
-<?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.sooka.sponest.event.emergency.dangerdeptmap.mapper.CentereventTEmergencyDangerdeptmapMapper">
-
-    <resultMap type="CentereventTEmergencyDangerdeptmap" id="CentereventTEmergencyDangerdeptmapResult">
-        <result property="pkId" column="pk_id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="deleteBy" column="delete_by"/>
-        <result property="deleteTime" column="delete_time"/>
-        <result property="dataStatus" column="data_status"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="deptName" column="dept_name"/>
-        <result property="dangerId" column="danger_id"/>
-        <result property="handleStatus" column="handle_status"/>
-        <result property="owndeptid" column="owndeptid"/>
-    </resultMap>
-
-    <sql id="selectCentereventTEmergencyDangerdeptmapVo">
-        select pk_id, create_by, create_time, update_by, update_time, delete_by, delete_time, data_status, dept_id, dept_name, danger_id, handle_status, owndeptid from centerevent_t_emergency_dangerdeptmap
-    </sql>
-
-    <select id="selectCentereventTEmergencyDangerdeptmapList" parameterType="CentereventTEmergencyDangerdeptmap"
-            resultMap="CentereventTEmergencyDangerdeptmapResult">
-        <include refid="selectCentereventTEmergencyDangerdeptmapVo"/>
-        <where>
-            <if test="deleteBy != null  and deleteBy != ''">and delete_by = #{deleteBy}</if>
-            <if test="deleteTime != null ">and delete_time = #{deleteTime}</if>
-            <if test="dataStatus != null  and dataStatus != ''">and data_status = #{dataStatus}</if>
-            <if test="deptId != null  and deptId != ''">and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
-            <if test="dangerId != null  and dangerId != ''">and danger_id = #{dangerId}</if>
-            <if test="handleStatus != null  and handleStatus != ''">and handle_status = #{handleStatus}</if>
-            <if test="owndeptid != null ">and owndeptid = #{owndeptid}</if>
-        </where>
-    </select>
-
-    <select id="selectCentereventTEmergencyDangerdeptmapByPkId" parameterType="String"
-            resultMap="CentereventTEmergencyDangerdeptmapResult">
-        <include refid="selectCentereventTEmergencyDangerdeptmapVo"/>
-        where pk_id = #{pkId}
-    </select>
-
-    <insert id="insertCentereventTEmergencyDangerdeptmap" parameterType="CentereventTEmergencyDangerdeptmap">
-        insert into centerevent_t_emergency_dangerdeptmap
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="pkId != null">pk_id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="deleteBy != null">delete_by,</if>
-            <if test="deleteTime != null">delete_time,</if>
-            <if test="dataStatus != null">data_status,</if>
-            <if test="deptId != null">dept_id,</if>
-            <if test="deptName != null">dept_name,</if>
-            <if test="dangerId != null">danger_id,</if>
-            <if test="handleStatus != null">handle_status,</if>
-            <if test="owndeptid != null">owndeptid,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="pkId != null">#{pkId},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="deleteBy != null">#{deleteBy},</if>
-            <if test="deleteTime != null">#{deleteTime},</if>
-            <if test="dataStatus != null">#{dataStatus},</if>
-            <if test="deptId != null">#{deptId},</if>
-            <if test="deptName != null">#{deptName},</if>
-            <if test="dangerId != null">#{dangerId},</if>
-            <if test="handleStatus != null">#{handleStatus},</if>
-            <if test="owndeptid != null">#{owndeptid},</if>
-        </trim>
-    </insert>
-
-    <update id="updateCentereventTEmergencyDangerdeptmap" parameterType="CentereventTEmergencyDangerdeptmap">
-        update centerevent_t_emergency_dangerdeptmap
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deleteBy != null">delete_by = #{deleteBy},</if>
-            <if test="deleteTime != null">delete_time = #{deleteTime},</if>
-            <if test="dataStatus != null">data_status = #{dataStatus},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="deptName != null">dept_name = #{deptName},</if>
-            <if test="dangerId != null">danger_id = #{dangerId},</if>
-            <if test="handleStatus != null">handle_status = #{handleStatus},</if>
-            <if test="owndeptid != null">owndeptid = #{owndeptid},</if>
-        </trim>
-        where pk_id = #{pkId}
-    </update>
-
-    <delete id="deleteCentereventTEmergencyDangerdeptmapByPkIds" parameterType="String">
-        delete from centerevent_t_emergency_dangerdeptmap where pk_id in
-        <foreach item="pkId" collection="array" open="(" separator="," close=")">
-            #{pkId}
-        </foreach>
-    </delete>
-</mapper>

+ 0 - 130
src/main/resources/mapper/emergency/dangerprocess/CentereventTEmergencyDangerprocessMapper.xml

@@ -1,130 +0,0 @@
-<?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.sooka.sponest.event.emergency.dangerprocess.mapper.CentereventTEmergencyDangerprocessMapper">
-
-    <resultMap type="CentereventTEmergencyDangerprocess" id="CentereventTEmergencyDangerprocessResult">
-        <result property="id" column="id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="dataStatus" column="data_status"/>
-        <result property="dangerId" column="danger_id"/>
-        <result property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="processDes" column="process_des"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="deptName" column="dept_name"/>
-        <result property="processType" column="process_type"/>
-        <result property="owndeptid" column="owndeptid"/>
-    </resultMap>
-
-    <sql id="selectCentereventTEmergencyDangerprocessVo">
-        select id, create_by, create_time, data_status, danger_id, user_id, user_name, process_des, dept_id, dept_name, process_type, owndeptid from centerevent_t_emergency_dangerprocess
-    </sql>
-
-    <select id="selectCentereventTEmergencyDangerprocessList" parameterType="CentereventTEmergencyDangerprocess"
-            resultMap="CentereventTEmergencyDangerprocessResult">
-        <include refid="selectCentereventTEmergencyDangerprocessVo"/>
-        <where>
-            <if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
-            <if test="dangerId != null and dangerId != ''">and danger_id = #{dangerId}</if>
-            <if test="userId != null">and user_id = #{userId}</if>
-            <if test="userName != null and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
-            <if test="processDes != null and processDes != ''">and process_des = #{processDes}</if>
-            <if test="deptId != null">and dept_id = #{deptId}</if>
-            <if test="deptName != null and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
-            <if test="processType != null and processType != ''">and process_type = #{processType}</if>
-            <if test="owndeptid != null">and owndeptid = #{owndeptid}</if>
-        </where>
-        order by create_time desc
-    </select>
-
-    <select id="selectCentereventTEmergencyDangerprocessByPkId" parameterType="String"
-            resultMap="CentereventTEmergencyDangerprocessResult">
-        <include refid="selectCentereventTEmergencyDangerprocessVo"/>
-        where id = #{pkId}
-    </select>
-
-    <insert id="insertCentereventTEmergencyDangerprocess" parameterType="CentereventTEmergencyDangerprocess">
-        insert into centerevent_t_emergency_dangerprocess
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="dataStatus != null">data_status,</if>
-            <if test="dangerId != null">danger_id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="userName != null and userName != ''">user_name,</if>
-            <if test="processDes != null">process_des,</if>
-            <if test="deptId != null">dept_id,</if>
-            <if test="deptName != null">dept_name,</if>
-            <if test="processType != null">process_type,</if>
-            <if test="owndeptid != null">owndeptid,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="dataStatus != null">#{dataStatus},</if>
-            <if test="dangerId != null">#{dangerId},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="userName != null and userName != ''">#{userName},</if>
-            <if test="processDes != null">#{processDes},</if>
-            <if test="deptId != null">#{deptId},</if>
-            <if test="deptName != null">#{deptName},</if>
-            <if test="processType != null">#{processType},</if>
-            <if test="owndeptid != null">#{owndeptid},</if>
-        </trim>
-    </insert>
-
-    <update id="updateCentereventTEmergencyDangerprocess" parameterType="CentereventTEmergencyDangerprocess">
-        update centerevent_t_emergency_dangerprocess
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="dataStatus != null">data_status = #{dataStatus},</if>
-            <if test="dangerId != null">danger_id = #{dangerId},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="userName != null and userName != ''">user_name = #{userName},</if>
-            <if test="processDes != null">process_des = #{processDes},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="deptName != null">dept_name = #{deptName},</if>
-            <if test="processType != null">process_type = #{processType},</if>
-            <if test="owndeptid != null">owndeptid = #{owndeptid},</if>
-        </trim>
-        where id = #{pk_id}
-    </update>
-
-    <delete id="deleteCentereventTEmergencyDangerprocessByPkIds" parameterType="String">
-        delete from centerevent_t_emergency_dangerprocess where id in
-        <foreach item="pkId" collection="array" open="(" separator="," close=")">
-            #{pkId}
-        </foreach>
-    </delete>
-    <select id="getHeatMap" parameterType="DayBody"
-            resultType="java.util.Map">
-        SELECT
-            a.longitude,
-            a.latitude
-        FROM
-            ${database_event}.centerevent_t_emergency_danger a
-                LEFT JOIN ${database_data}.centerdata_t_emergency_enterprise b ON a.enterprise_id = b.id
-                LEFT JOIN ${database_system}.sys_dept c ON c.dept_id =b.dept_id
-                LEFT JOIN ${database_system}.sys_user_dept d ON d.dept_id=d.dept_id
-                LEFT JOIN ${database_system}.sys_user e ON e.user_id=d.user_id
-                AND ( SELECT count(*) FROM onest_event.centerevent_t_emergency_danger c WHERE c.enterprise_id = b.id )>(
-                    SELECT
-                        config_value
-                    FROM
-                        ${database_system}.sys_config
-                    WHERE
-                        config_key = 'high.risk'
-                )
-        WHERE
-                DATE_FORMAT( a.create_time, '%Y' )= #{day}
-                ${params.dataScope}
-        GROUP BY
-            a.enterprise_id
-    </select>
-</mapper>

+ 0 - 223
src/main/resources/mapper/emergency/inspectionrecord/CentereventTEmergencyInspectionrecordMapper.xml

@@ -1,223 +0,0 @@
-<?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.sooka.sponest.event.emergency.inspectionrecord.mapper.CentereventTEmergencyInspectionrecordMapper">
-
-    <resultMap type="CentereventTEmergencyInspectionrecord" id="CentereventTEmergencyInspectionrecordResult">
-        <result property="id"    column="id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="deleteBy"    column="delete_by"    />
-        <result property="deleteTime"    column="delete_time"    />
-        <result property="dataStatus"    column="data_status"    />
-        <result property="enterpriseId"    column="enterprise_id"    />
-        <result property="enterpriseName"    column="enterprise_name"    />
-        <result property="inspectionTime"    column="inspection_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-        <result property="isHavedanger"    column="is_havedanger"    />
-        <result property="dangerId"    column="danger_id"    />
-        <result property="owndeptid"    column="owndeptid"    />
-        <result property="deptId"    column="dept_id"    />
-    </resultMap>
-    <resultMap type="CentereventTEmergencyInspectionrecordBdody" id="CentereventTEmergencyInspectionrecordBdody">
-        <result property="id"    column="id"    />
-        <result property="itemName"    column="item_name"    />
-        <result property="itemRemark"    column="item_remark"    />
-        <result property="imspectiontypeId"    column="imspectiontype_id"    />
-        <result property="imspectiontypeName"    column="imspectiontype_name"    />
-        <result property="imspectiontypefirstName"    column="imspectiontypefirst_name"    />
-        <result property="enterpriseName"    column="enterprise_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="enterpriseId"    column="enterprise_id"    />
-        <result property="Content"    column="Content"    />
-        <result property="inspectionitemCheck"    column="inspectionitem_check"    />
-
-    </resultMap>
-
-
-
-    <sql id="selectCentereventTEmergencyInspectionrecordVo">
-        select id, create_by, create_time, update_by, update_time, delete_by, delete_time, data_status, enterprise_id, enterprise_name, inspection_time, user_id, user_name, longitude, latitude, is_havedanger, danger_id, owndeptid, dept_id from centerevent_t_emergency_inspectionrecord
-    </sql>
-
-    <select id="selectCentereventTEmergencyInspectionrecordList" parameterType="CentereventTEmergencyInspectionrecord" resultMap="CentereventTEmergencyInspectionrecordResult">
-        <include refid="selectCentereventTEmergencyInspectionrecordVo"/>
-        <where>
-            <if test="deleteBy != null  and deleteBy != ''"> and delete_by = #{deleteBy}</if>
-            <if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
-            <if test="dataStatus != null  and dataStatus != ''"> and data_status = #{dataStatus}</if>
-            <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
-            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
-            <if test="inspectionTime != null "> and inspection_time = #{inspectionTime}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
-            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
-            <if test="isHavedanger != null  and isHavedanger != ''"> and is_havedanger = #{isHavedanger}</if>
-            <if test="dangerId != null  and dangerId != ''"> and danger_id = #{dangerId}</if>
-            <if test="owndeptid != null "> and owndeptid = #{owndeptid}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-        </where>
-         order by create_time desc
-    </select>
-
-    <select id="selectCentereventTEmergencyInspectionrecordById" parameterType="String" resultMap="CentereventTEmergencyInspectionrecordResult">
-        <include refid="selectCentereventTEmergencyInspectionrecordVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertCentereventTEmergencyInspectionrecord" parameterType="CentereventTEmergencyInspectionrecord">
-        insert into centerevent_t_emergency_inspectionrecord
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="deleteBy != null">delete_by,</if>
-            <if test="deleteTime != null">delete_time,</if>
-            <if test="dataStatus != null">data_status,</if>
-            <if test="enterpriseId != null">enterprise_id,</if>
-            <if test="enterpriseName != null">enterprise_name,</if>
-            <if test="inspectionTime != null">inspection_time,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="longitude != null">longitude,</if>
-            <if test="latitude != null">latitude,</if>
-            <if test="isHavedanger != null">is_havedanger,</if>
-            <if test="dangerId != null">danger_id,</if>
-            <if test="owndeptid != null">owndeptid,</if>
-            <if test="deptId != null">dept_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="deleteBy != null">#{deleteBy},</if>
-            <if test="deleteTime != null">#{deleteTime},</if>
-            <if test="dataStatus != null">#{dataStatus},</if>
-            <if test="enterpriseId != null">#{enterpriseId},</if>
-            <if test="enterpriseName != null">#{enterpriseName},</if>
-            <if test="inspectionTime != null">#{inspectionTime},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="longitude != null">#{longitude},</if>
-            <if test="latitude != null">#{latitude},</if>
-            <if test="isHavedanger != null">#{isHavedanger},</if>
-            <if test="dangerId != null">#{dangerId},</if>
-            <if test="owndeptid != null">#{owndeptid},</if>
-            <if test="deptId != null">#{deptId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCentereventTEmergencyInspectionrecord" parameterType="CentereventTEmergencyInspectionrecord">
-        update centerevent_t_emergency_inspectionrecord
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deleteBy != null">delete_by = #{deleteBy},</if>
-            <if test="deleteTime != null">delete_time = #{deleteTime},</if>
-            <if test="dataStatus != null">data_status = #{dataStatus},</if>
-            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
-            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
-            <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="longitude != null">longitude = #{longitude},</if>
-            <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="isHavedanger != null">is_havedanger = #{isHavedanger},</if>
-            <if test="dangerId != null">danger_id = #{dangerId},</if>
-            <if test="owndeptid != null">owndeptid = #{owndeptid},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCentereventTEmergencyInspectionrecordById" parameterType="String">
-        delete from centerevent_t_emergency_inspectionrecord where id = #{id}
-    </delete>
-
-    <delete id="deleteCentereventTEmergencyInspectionrecordByIds" parameterType="String">
-        delete from centerevent_t_emergency_inspectionrecord where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-<select id="selectCentereventTEmergencyInspectionrecordMessageList" parameterType="EmergencyInspectionrecordSelectBody" resultMap="CentereventTEmergencyInspectionrecordBdody">
-
-    SELECT
-        cet.id,
-        cet.inspectionitem_name AS item_name,
-        cei.item_remark,
-        cet.inspectionitem_id AS imspectiontype_id,
-        ctei.enterprise_name,
-        ctei.enterprise_id,
-        cet.inspectionitem_desc as content,
-        CASE
-            cet.inspection_result
-            WHEN 1 THEN
-                TRUE
-            WHEN 0 THEN
-                FALSE
-            END AS inspectionitem_check,
-        cep.inspection_name AS imspectiontype_name,
-        cep2.inspection_name AS imspectiontypefirst_name,
-        ctei.user_id,
-        ctei.user_name
-    FROM
-        ${database_event}.centerevent_t_emergency_inspectionrecorddetail cet
-            LEFT JOIN ${database_event}.centerevent_t_emergency_inspectionrecord ctei ON ctei.id = cet.inspectionrecord_id
-            LEFT JOIN ${database_data}.centerdata_t_emergency_inspectionitem cei ON cet.inspectionitem_id = cei.id
-            LEFT JOIN ${database_data}.centerdata_t_emergency_inspectiontype cep ON cei.imspectiontype_id = cep.id
-            LEFT JOIN ${database_data}.centerdata_t_emergency_inspectiontype cep2 ON cep.parent_id = cep2.id
-    WHERE
-        inspectionrecord_id = #{id}
-
-</select>
-    <select id="selectEmergencyList" parameterType="EmergencyInspectionrecordSelectBody" resultType="java.util.Map">
-        SELECT
-            d.dept_name as name,
-            COUNT(a.id) AS value
-        FROM
-            ${database_event}.centerevent_t_emergency_inspectionrecord a
-            LEFT JOIN 	${database_system}.sys_user u ON u.user_id= a.user_id
-            RIGHT JOIN ${database_system}.sys_user_dept ud ON ud.user_id = u.user_id
-            RIGHT JOIN ${database_system}.sys_dept d ON d.dept_id = ud.dept_id
-        WHERE
-            u.del_flag = '0'
-          AND (
-            d.dept_id = #{id}
-           OR d.dept_id IN ( SELECT t.dept_id FROM ${database_system}.sys_dept t WHERE find_in_set( #{id}, ancestors ) ))
-           ${params.dataScope}
-        GROUP BY
-            d.dept_name
-        UNION
-        SELECT
-            d.dept_name,
-            COUNT(a.id)
-        FROM
-            ${database_event}.centerevent_t_emergency_inspectionrecord a
-                RIGHT JOIN 	${database_system}.sys_user u ON u.user_id= a.user_id
-                RIGHT JOIN ${database_system}.sys_user_dept ud ON ud.user_id = u.user_id
-                RIGHT JOIN ${database_system}.sys_dept d ON d.dept_id = ud.dept_id
-        WHERE
-            u.del_flag = '0'
-          AND (
-                    d.dept_id = #{id}
-                OR d.dept_id IN ( SELECT t.dept_id FROM ${database_system}.sys_dept t WHERE find_in_set( #{id}, ancestors ) ))
-                ${params.dataScope}
-        GROUP BY
-            d.dept_name
-    </select>
-</mapper>

+ 0 - 26
src/main/resources/mapper/emergency/inspectionrecord/EmergencyBigDataMapper.xml

@@ -1,26 +0,0 @@
-<?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.sooka.sponest.event.emergency.inspectionrecord.mapper.EmergencyBigDataMapper">
-
-    <select id="getBigDataInspectionAnalysis" parameterType="CentereventTEmergencyInspectionrecord" resultType="java.util.Map">
-        SELECT
-            a.enterprise_id enterpriseId,
-            a.enterprise_name name,
-            count(a.id) value
-        FROM
-            centerevent_t_emergency_inspectionrecord a
-        group by a.enterprise_id
-    </select>
-
-    <select id="getBigDataInspectionContent" parameterType="CentereventTEmergencyInspectionrecord" resultType="java.util.Map">
-        SELECT
-            a.inspectionitem_id inspectionitemId,
-            a.inspectionitem_name name,
-            count(a.id) value
-        FROM
-            centerevent_t_emergency_inspectionrecorddetail a
-        group by a.inspectionitem_id
-    </select>
-</mapper>

+ 0 - 160
src/main/resources/mapper/emergency/inspectionrecorddetail/CentereventTEmergencyInspectionrecorddetailMapper.xml

@@ -1,160 +0,0 @@
-<?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.sooka.sponest.event.emergency.inspectionrecorddetail.mapper.CentereventTEmergencyInspectionrecorddetailMapper">
-    
-    <resultMap type="CentereventTEmergencyInspectionrecorddetail" id="CentereventTEmergencyInspectionrecorddetailResult">
-        <result property="id"    column="id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="deleteBy"    column="delete_by"    />
-        <result property="deleteTime"    column="delete_time"    />
-        <result property="dataStatus"    column="data_status"    />
-        <result property="inspectionrecordId"    column="inspectionrecord_id"    />
-        <result property="inspectionitemId"    column="inspectionitem_id"    />
-        <result property="inspectionitemName"    column="inspectionitem_name"    />
-        <result property="inspectionResult"    column="inspection_result"    />
-        <result property="inspectionitemDesc"    column="inspectionitem_desc"    />
-        <result property="owndeptid"    column="owndeptid"    />
-        <result property="deptId"    column="dept_id"    />
-    </resultMap>
-
-    <sql id="selectCentereventTEmergencyInspectionrecorddetailVo">
-        select id, create_by, create_time, update_by, update_time, delete_by, delete_time, data_status, inspectionrecord_id, inspectionitem_id, inspectionitem_name, inspection_result, inspectionitem_desc, owndeptid, dept_id from centerevent_t_emergency_inspectionrecorddetail
-    </sql>
-
-    <select id="selectCentereventTEmergencyInspectionrecorddetailList" parameterType="CentereventTEmergencyInspectionrecorddetail" resultMap="CentereventTEmergencyInspectionrecorddetailResult">
-        <include refid="selectCentereventTEmergencyInspectionrecorddetailVo"/>
-
-        <where>  
-            <if test="deleteBy != null  and deleteBy != ''"> and delete_by = #{deleteBy}</if>
-            <if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
-            <if test="dataStatus != null  and dataStatus != ''"> and data_status = #{dataStatus}</if>
-            <if test="inspectionrecordId != null  and inspectionrecordId != ''"> and inspectionrecord_id = #{inspectionrecordId}</if>
-            <if test="inspectionitemId != null  and inspectionitemId != ''"> and inspectionitem_id = #{inspectionitemId}</if>
-            <if test="inspectionitemName != null  and inspectionitemName != ''"> and inspectionitem_name like concat('%', #{inspectionitemName}, '%')</if>
-            <if test="inspectionResult != null  and inspectionResult != ''"> and inspection_result = #{inspectionResult}</if>
-            <if test="inspectionitemDesc != null  and inspectionitemDesc != ''"> and inspectionitem_desc = #{inspectionitemDesc}</if>
-            <if test="owndeptid != null "> and owndeptid = #{owndeptid}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-        </where>
-    </select>
-    
-    <select id="selectCentereventTEmergencyInspectionrecorddetailById" parameterType="String" resultMap="CentereventTEmergencyInspectionrecorddetailResult">
-        <include refid="selectCentereventTEmergencyInspectionrecorddetailVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertCentereventTEmergencyInspectionrecorddetail" parameterType="CentereventTEmergencyInspectionrecorddetail">
-        insert into centerevent_t_emergency_inspectionrecorddetail
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="deleteBy != null">delete_by,</if>
-            <if test="deleteTime != null">delete_time,</if>
-            <if test="dataStatus != null">data_status,</if>
-            <if test="inspectionrecordId != null">inspectionrecord_id,</if>
-            <if test="inspectionitemId != null">inspectionitem_id,</if>
-            <if test="inspectionitemName != null">inspectionitem_name,</if>
-            <if test="inspectionResult != null">inspection_result,</if>
-            <if test="inspectionitemDesc != null">inspectionitem_desc,</if>
-            <if test="owndeptid != null">owndeptid,</if>
-            <if test="deptId != null">dept_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="deleteBy != null">#{deleteBy},</if>
-            <if test="deleteTime != null">#{deleteTime},</if>
-            <if test="dataStatus != null">#{dataStatus},</if>
-            <if test="inspectionrecordId != null">#{inspectionrecordId},</if>
-            <if test="inspectionitemId != null">#{inspectionitemId},</if>
-            <if test="inspectionitemName != null">#{inspectionitemName},</if>
-            <if test="inspectionResult != null">#{inspectionResult},</if>
-            <if test="inspectionitemDesc != null">#{inspectionitemDesc},</if>
-            <if test="owndeptid != null">#{owndeptid},</if>
-            <if test="deptId != null">#{deptId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCentereventTEmergencyInspectionrecorddetail" parameterType="CentereventTEmergencyInspectionrecorddetail">
-        update centerevent_t_emergency_inspectionrecorddetail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deleteBy != null">delete_by = #{deleteBy},</if>
-            <if test="deleteTime != null">delete_time = #{deleteTime},</if>
-            <if test="dataStatus != null">data_status = #{dataStatus},</if>
-            <if test="inspectionrecordId != null">inspectionrecord_id = #{inspectionrecordId},</if>
-            <if test="inspectionitemId != null">inspectionitem_id = #{inspectionitemId},</if>
-            <if test="inspectionitemName != null">inspectionitem_name = #{inspectionitemName},</if>
-            <if test="inspectionResult != null">inspection_result = #{inspectionResult},</if>
-            <if test="inspectionitemDesc != null">inspectionitem_desc = #{inspectionitemDesc},</if>
-            <if test="owndeptid != null">owndeptid = #{owndeptid},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCentereventTEmergencyInspectionrecorddetailById" parameterType="String">
-        delete from centerevent_t_emergency_inspectionrecorddetail where id = #{id}
-    </delete>
-
-    <delete id="deleteCentereventTEmergencyInspectionrecorddetailByIds" parameterType="String">
-        delete from centerevent_t_emergency_inspectionrecorddetail where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-
-<select id="selectAdoptionList" parameterType="CentereventTEmergencyInspectionrecorddetailBody" resultType="java.util.Map">
-
-SELECT
-b.item_name as name,
-COUNT(a.inspection_result) AS value
-FROM
-centerevent_t_emergency_inspectionrecorddetail a
-RIGHT JOIN onest_data.centerdata_t_emergency_inspectionitem b ON a.inspectionitem_id= b.id  AND a.inspection_result= #{inspectionResult}
-LEFT JOIN  centerevent_t_emergency_inspectionrecord e ON e.id= a.inspectionrecord_id
-LEFT JOIN ${database_data}.centerdata_t_emergency_enterprise c ON  c.id=e.enterprise_id
-LEFT JOIN ${database_system}.sys_dept z ON c.dept_id = z.dept_id
-LEFT JOIN ${database_system}.sys_user u ON c.create_by = u.user_id
-WHERE 1=1 ${params.dataScope}
-GROUP BY
-b.item_name,a.inspection_result
-</select>
-<select id="selectHightAdoptionList" parameterType="CentereventTEmergencyInspectionrecorddetailBody" resultType="java.util.Map">
-
-	SELECT
-	name,
-	value
-	FROM
-(	SELECT
-b.item_name as name,
-COUNT(a.inspection_result) AS value
-FROM
-centerevent_t_emergency_inspectionrecorddetail a
-RIGHT JOIN ${database_data}.centerdata_t_emergency_inspectionitem b ON a.inspectionitem_id= b.id AND a.inspection_result=1
-LEFT JOIN  centerevent_t_emergency_inspectionrecord e ON e.id= a.inspectionrecord_id
-LEFT JOIN ${database_data}.centerdata_t_emergency_enterprise c ON  c.id=e.enterprise_id
-LEFT JOIN ${database_system}.sys_dept z ON c.dept_id = z.dept_id
-LEFT JOIN ${database_system}.sys_user u ON c.create_by = u.user_id
-WHERE 1=1 ${params.dataScope}
-GROUP BY
-b.item_name,a.inspection_result
-) AS a WHERE a.value > (SELECT config_value FROM onest_system.sys_config WHERE config_key='high.trade')
-
-</select>
-</mapper>

+ 0 - 119
src/main/resources/mapper/emergency/patroloverdue/CentereventTEmergencyPatroloverdueMapper.xml

@@ -1,119 +0,0 @@
-<?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.sooka.sponest.event.emergency.patroloverdue.mapper.CentereventTEmergencyPatroloverdueMapper">
-    
-    <resultMap type="CentereventTEmergencyPatroloverdue" id="CentereventTEmergencyPatroloverdueResult">
-        <result property="id"    column="id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="deleteBy"    column="delete_by"    />
-        <result property="deleteTime"    column="delete_time"    />
-        <result property="dataStatus"    column="data_status"    />
-        <result property="patrolpointId"    column="patrolpoint_id"    />
-        <result property="patrolpointName"    column="patrolpoint_name"    />
-        <result property="patrolpointBegin"    column="patrolpoint_begin"    />
-        <result property="patrolpointEnd"    column="patrolpoint_end"    />
-        <result property="overdueDay"    column="overdue_day"    />
-        <result property="owndeptid"    column="owndeptid"    />
-        <result property="deptId"    column="dept_id"    />
-    </resultMap>
-
-    <sql id="selectCentereventTEmergencyPatroloverdueVo">
-        select id, create_by, create_time, update_by, update_time, delete_by, delete_time, data_status, patrolpoint_id, patrolpoint_name, patrolpoint_begin, patrolpoint_end, overdue_day, owndeptid, dept_id from centerevent_t_emergency_patroloverdue
-    </sql>
-
-    <select id="selectCentereventTEmergencyPatroloverdueList" parameterType="CentereventTEmergencyPatroloverdue" resultMap="CentereventTEmergencyPatroloverdueResult">
-        <include refid="selectCentereventTEmergencyPatroloverdueVo"/>
-        <where>  
-            <if test="deleteBy != null  and deleteBy != ''"> and delete_by = #{deleteBy}</if>
-            <if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
-            <if test="dataStatus != null  and dataStatus != ''"> and data_status = #{dataStatus}</if>
-            <if test="patrolpointId != null  and patrolpointId != ''"> and patrolpoint_id = #{patrolpointId}</if>
-            <if test="patrolpointName != null  and patrolpointName != ''"> and patrolpoint_name like concat('%', #{patrolpointName}, '%')</if>
-            <if test="patrolpointBegin != null "> and patrolpoint_begin = #{patrolpointBegin}</if>
-            <if test="patrolpointEnd != null "> and patrolpoint_end = #{patrolpointEnd}</if>
-            <if test="overdueDay != null "> and overdue_day = #{overdueDay}</if>
-            <if test="owndeptid != null "> and owndeptid = #{owndeptid}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-        </where>
-    </select>
-    
-    <select id="selectCentereventTEmergencyPatroloverdueById" parameterType="String" resultMap="CentereventTEmergencyPatroloverdueResult">
-        <include refid="selectCentereventTEmergencyPatroloverdueVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertCentereventTEmergencyPatroloverdue" parameterType="CentereventTEmergencyPatroloverdue">
-        insert into centerevent_t_emergency_patroloverdue
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="deleteBy != null">delete_by,</if>
-            <if test="deleteTime != null">delete_time,</if>
-            <if test="dataStatus != null">data_status,</if>
-            <if test="patrolpointId != null">patrolpoint_id,</if>
-            <if test="patrolpointName != null">patrolpoint_name,</if>
-            <if test="patrolpointBegin != null">patrolpoint_begin,</if>
-            <if test="patrolpointEnd != null">patrolpoint_end,</if>
-            <if test="overdueDay != null">overdue_day,</if>
-            <if test="owndeptid != null">owndeptid,</if>
-            <if test="deptId != null">dept_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="deleteBy != null">#{deleteBy},</if>
-            <if test="deleteTime != null">#{deleteTime},</if>
-            <if test="dataStatus != null">#{dataStatus},</if>
-            <if test="patrolpointId != null">#{patrolpointId},</if>
-            <if test="patrolpointName != null">#{patrolpointName},</if>
-            <if test="patrolpointBegin != null">#{patrolpointBegin},</if>
-            <if test="patrolpointEnd != null">#{patrolpointEnd},</if>
-            <if test="overdueDay != null">#{overdueDay},</if>
-            <if test="owndeptid != null">#{owndeptid},</if>
-            <if test="deptId != null">#{deptId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCentereventTEmergencyPatroloverdue" parameterType="CentereventTEmergencyPatroloverdue">
-        update centerevent_t_emergency_patroloverdue
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deleteBy != null">delete_by = #{deleteBy},</if>
-            <if test="deleteTime != null">delete_time = #{deleteTime},</if>
-            <if test="dataStatus != null">data_status = #{dataStatus},</if>
-            <if test="patrolpointId != null">patrolpoint_id = #{patrolpointId},</if>
-            <if test="patrolpointName != null">patrolpoint_name = #{patrolpointName},</if>
-            <if test="patrolpointBegin != null">patrolpoint_begin = #{patrolpointBegin},</if>
-            <if test="patrolpointEnd != null">patrolpoint_end = #{patrolpointEnd},</if>
-            <if test="overdueDay != null">overdue_day = #{overdueDay},</if>
-            <if test="owndeptid != null">owndeptid = #{owndeptid},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCentereventTEmergencyPatroloverdueById" parameterType="String">
-        delete from centerevent_t_emergency_patroloverdue where id = #{id}
-    </delete>
-
-    <delete id="deleteCentereventTEmergencyPatroloverdueByIds" parameterType="String">
-        delete from centerevent_t_emergency_patroloverdue where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

+ 0 - 179
src/main/resources/mapper/emergency/patrolrecord/CentereventTEmergencyPatrolrecordMapper.xml

@@ -1,179 +0,0 @@
-<?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.sooka.sponest.event.emergency.patrolrecord.mapper.CentereventTEmergencyPatrolrecordMapper">
-
-    <resultMap type="CentereventTEmergencyPatrolrecord" id="CentereventTEmergencyPatrolrecordResult">
-        <result property="id"    column="id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="deleteBy"    column="delete_by"    />
-        <result property="deleteTime"    column="delete_time"    />
-        <result property="dataStatus"    column="data_status"    />
-        <result property="patrolpointId"    column="patrolpoint_id"    />
-        <result property="patrolpointName"    column="patrolpoint_name"    />
-        <result property="patrolpointAddress"    column="patrolpoint_address"    />
-        <result property="patrolTime"    column="patrol_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="longitude"    column="longitude"    />
-        <result property="latitude"    column="latitude"    />
-        <result property="patrolInserttype"    column="patrol_inserttype"    />
-        <result property="isHavedanger"    column="is_havedanger"    />
-        <result property="dangerId"    column="danger_id"    />
-        <result property="owndeptid"    column="owndeptid"    />
-        <result property="deptId"    column="dept_id"    />
-    </resultMap>
-
-    <sql id="selectCentereventTEmergencyPatrolrecordVo">
-        select id, create_by, create_time, update_by, update_time, delete_by, delete_time, data_status, patrolpoint_id, patrolpoint_name, patrolpoint_address, patrol_time, user_id, user_name, longitude, latitude, patrol_inserttype, is_havedanger, danger_id, owndeptid, dept_id from centerevent_t_emergency_patrolrecord
-    </sql>
-
-    <select id="selectCentereventTEmergencyPatrolrecordList" parameterType="CentereventTEmergencyPatrolrecord" resultMap="CentereventTEmergencyPatrolrecordResult">
-        <include refid="selectCentereventTEmergencyPatrolrecordVo"/>
-        <where>
-            <if test="deleteBy != null  and deleteBy != ''"> and delete_by = #{deleteBy}</if>
-            <if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
-            <if test="dataStatus != null  and dataStatus != ''"> and data_status = #{dataStatus}</if>
-            <if test="patrolpointId != null  and patrolpointId != ''"> and patrolpoint_id = #{patrolpointId}</if>
-            <if test="patrolpointName != null  and patrolpointName != ''"> and patrolpoint_name like concat('%', #{patrolpointName}, '%')</if>
-            <if test="patrolpointAddress != null  and patrolpointAddress != ''"> and patrolpoint_address = #{patrolpointAddress}</if>
-            <if test="patrolTime != null "> and patrol_time = #{patrolTime}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
-            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
-            <if test="patrolInserttype != null  and patrolInserttype != ''"> and patrol_inserttype = #{patrolInserttype}</if>
-            <if test="isHavedanger != null  and isHavedanger != ''"> and is_havedanger = #{isHavedanger}</if>
-            <if test="dangerId != null  and dangerId != ''"> and danger_id = #{dangerId}</if>
-            <if test="owndeptid != null "> and owndeptid = #{owndeptid}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-        </where>
-    </select>
-
-    <select id="selectCentereventTEmergencyPatrolrecordById" parameterType="String" resultMap="CentereventTEmergencyPatrolrecordResult">
-        <include refid="selectCentereventTEmergencyPatrolrecordVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertCentereventTEmergencyPatrolrecord" parameterType="CentereventTEmergencyPatrolrecord">
-        insert into centerevent_t_emergency_patrolrecord
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="deleteBy != null">delete_by,</if>
-            <if test="deleteTime != null">delete_time,</if>
-            <if test="dataStatus != null">data_status,</if>
-            <if test="patrolpointId != null">patrolpoint_id,</if>
-            <if test="patrolpointName != null">patrolpoint_name,</if>
-            <if test="patrolpointAddress != null">patrolpoint_address,</if>
-            <if test="patrolTime != null">patrol_time,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="longitude != null">longitude,</if>
-            <if test="latitude != null">latitude,</if>
-            <if test="patrolInserttype != null">patrol_inserttype,</if>
-            <if test="isHavedanger != null">is_havedanger,</if>
-            <if test="dangerId != null">danger_id,</if>
-            <if test="owndeptid != null">owndeptid,</if>
-            <if test="deptId != null">dept_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="deleteBy != null">#{deleteBy},</if>
-            <if test="deleteTime != null">#{deleteTime},</if>
-            <if test="dataStatus != null">#{dataStatus},</if>
-            <if test="patrolpointId != null">#{patrolpointId},</if>
-            <if test="patrolpointName != null">#{patrolpointName},</if>
-            <if test="patrolpointAddress != null">#{patrolpointAddress},</if>
-            <if test="patrolTime != null">#{patrolTime},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="longitude != null">#{longitude},</if>
-            <if test="latitude != null">#{latitude},</if>
-            <if test="patrolInserttype != null">#{patrolInserttype},</if>
-            <if test="isHavedanger != null">#{isHavedanger},</if>
-            <if test="dangerId != null">#{dangerId},</if>
-            <if test="owndeptid != null">#{owndeptid},</if>
-            <if test="deptId != null">#{deptId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCentereventTEmergencyPatrolrecord" parameterType="CentereventTEmergencyPatrolrecord">
-        update centerevent_t_emergency_patrolrecord
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deleteBy != null">delete_by = #{deleteBy},</if>
-            <if test="deleteTime != null">delete_time = #{deleteTime},</if>
-            <if test="dataStatus != null">data_status = #{dataStatus},</if>
-            <if test="patrolpointId != null">patrolpoint_id = #{patrolpointId},</if>
-            <if test="patrolpointName != null">patrolpoint_name = #{patrolpointName},</if>
-            <if test="patrolpointAddress != null">patrolpoint_address = #{patrolpointAddress},</if>
-            <if test="patrolTime != null">patrol_time = #{patrolTime},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="longitude != null">longitude = #{longitude},</if>
-            <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="patrolInserttype != null">patrol_inserttype = #{patrolInserttype},</if>
-            <if test="isHavedanger != null">is_havedanger = #{isHavedanger},</if>
-            <if test="dangerId != null">danger_id = #{dangerId},</if>
-            <if test="owndeptid != null">owndeptid = #{owndeptid},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCentereventTEmergencyPatrolrecordById" parameterType="String">
-        delete from centerevent_t_emergency_patrolrecord where id = #{id}
-    </delete>
-
-    <delete id="deleteCentereventTEmergencyPatrolrecordByIds" parameterType="String">
-        delete from centerevent_t_emergency_patrolrecord where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="getCentereventTEmergencyPatrolrecordNewData" parameterType="String" resultMap="CentereventTEmergencyPatrolrecordResult">
-        <include refid="selectCentereventTEmergencyPatrolrecordVo"/>
-        where patrolpoint_id=#{patrolpointId}
-        order by patrol_time desc LIMIT 1
-    </select>
-
-    <select id="findItudeByUserIdAndTime" parameterType="String" resultType="java.util.Map">
-        SELECT
-            a.longitude,a.latitude
-        FROM
-            centerevent_t_emergency_inspectionrecord a
-        LEFT JOIN onest_data.centerdata_t_emergency_enterprise b ON a.enterprise_id = b.id
-        WHERE
-            a.user_id = #{userId}
-         AND DATE_FORMAT(a.create_time,'%Y-%m-%d') = DATE_FORMAT(#{time},'%Y-%m-%d')
-	    order by a.create_time
-    </select>
-
-    <select id="findItudeByUserId" parameterType="String" resultType="java.util.Map">
-        SELECT
-            a.user_id as userId,
-            a.user_name as userName,
-            DATE_FORMAT(a.create_time,'%Y-%m-%d') as time
-        FROM
-            centerevent_t_emergency_inspectionrecord a
-        LEFT JOIN onest_data.centerdata_t_emergency_enterprise b ON a.enterprise_id = b.id
-         WHERE a.user_id = #{userId}
-        group by DATE_FORMAT(a.create_time,'%Y-%m-%d')
-    </select>
-</mapper>