Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/event/centereventteventtypemonitor/controller/CentereventTEventtypeMonitorController.java

@@ -2,8 +2,6 @@ package com.sooka.sponest.event.centereventteventtypemonitor.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -11,17 +9,14 @@ 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.ruoyi.system.api.RemoteDeptService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.vo.VisuForestCloudMapVO;
 import com.sooka.sponest.event.centereventteventtypemonitor.domain.CentereventTEventtypeMonitor;
 import com.sooka.sponest.event.centereventteventtypemonitor.service.ICentereventTEventtypemonitorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -36,36 +31,8 @@ import java.util.List;
 @RequestMapping("/eventtypemonitor")
 public class CentereventTEventtypeMonitorController extends BaseController {
 
-    @Resource
-    private ICentereventTEventtypemonitorService iCentereventTEventtypemonitorService;
-
-    @ApiOperation("查询事件类型模版树结构")
-    @GetMapping("/getCentereventTEventtypemonitorTree/{templateType}")
-    public R getCentereventTEventtypemonitorTree(@PathVariable("templateType") String templateType) {
-        return R.ok(iCentereventTEventtypemonitorService.getCentereventTEventtypemonitorTree(templateType));
-    }
-
-    @ApiOperation("查询事件模版分类数量")
-    @PostMapping("/getEventByEventTypemonitor")
-    public R getEventByEventTypemonitor(@RequestBody VisuForestCloudMapVO visuForestCloudMapVO) {
-        return R.ok(iCentereventTEventtypemonitorService.getEventByEventType(visuForestCloudMapVO));
-    }
-
-    public void getParam(VisuForestCloudMapVO visuForestCloudMapVO) {
-        // 未配置可视化可见类型，小类给-1不可查
-        if (StringUtils.isEmpty(visuForestCloudMapVO.getEventTypeId())) {
-            visuForestCloudMapVO.setEventTypeId(new String[]{"-1"});
-        }
-        // 配置包含火险事件，大类给1，否则给-1无需查询
-        String[] dl = visuForestCloudMapVO.getEventTypeIdDl();
-        if (ArrayUtils.contains(dl, "1")) {
-            visuForestCloudMapVO.setEventTypeIdDl(new String[]{"1"});
-        } else {
-            visuForestCloudMapVO.setEventTypeIdDl(new String[]{"-1"});
-        }
-        R<Boolean> result = SpringUtils.getBean(RemoteDeptService.class).deptParentsHasBureau(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        visuForestCloudMapVO.setIsHgj(result.getData().toString());
-    }
+    @Autowired
+    private ICentereventTEventtypemonitorService centereventTEventtypemonitorService;
 
     /**
      * 查询事件模版类型列表
@@ -74,18 +41,10 @@ public class CentereventTEventtypeMonitorController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(CentereventTEventtypeMonitor centereventTEventtypeMonitor) {
         startPage();
-        List<CentereventTEventtypeMonitor> list = iCentereventTEventtypemonitorService.selectCentereventTEventtypeMonitorList(centereventTEventtypeMonitor);
+        List<CentereventTEventtypeMonitor> list = centereventTEventtypemonitorService.selectCentereventTEventtypeMonitorList(centereventTEventtypeMonitor);
         return getDataTable(list);
     }
 
-    @RequiresPermissions("eventtypemonitor:eventtypemonitor:add")
-    @Log(title = "事件类型增加小类", businessType = BusinessType.INSERT)
-    @PostMapping("/saveTypelx")
-    public AjaxResult saveTypelx(@RequestBody String data) {
-        List<CentereventTEventtypeMonitor> centereventTEventtypeMonitors = JSON.parseArray(data, CentereventTEventtypeMonitor.class);
-        return toAjax(iCentereventTEventtypemonitorService.saveTypelx(centereventTEventtypeMonitors));
-    }
-
     /**
      * 导出事件模版类型列表
      */
@@ -93,8 +52,8 @@ public class CentereventTEventtypeMonitorController extends BaseController {
     @Log(title = "事件模版类型", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CentereventTEventtypeMonitor centereventTEventtypeMonitor) {
-        List<CentereventTEventtypeMonitor> list = iCentereventTEventtypemonitorService.selectCentereventTEventtypeMonitorList(centereventTEventtypeMonitor);
-        ExcelUtil<CentereventTEventtypeMonitor> util = new ExcelUtil<CentereventTEventtypeMonitor>(CentereventTEventtypeMonitor.class);
+        List<CentereventTEventtypeMonitor> list = centereventTEventtypemonitorService.selectCentereventTEventtypeMonitorList(centereventTEventtypeMonitor);
+        ExcelUtil<CentereventTEventtypeMonitor> util = new ExcelUtil<>(CentereventTEventtypeMonitor.class);
         util.exportExcel(response, list, "事件模版类型数据");
     }
 
@@ -104,7 +63,7 @@ public class CentereventTEventtypeMonitorController extends BaseController {
     @RequiresPermissions("eventtypemonitor:eventtypemonitor:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(iCentereventTEventtypemonitorService.selectCentereventTEventtypeMonitorById(id));
+        return AjaxResult.success(centereventTEventtypemonitorService.selectCentereventTEventtypeMonitorById(id));
     }
 
     /**
@@ -114,7 +73,7 @@ public class CentereventTEventtypeMonitorController extends BaseController {
     @Log(title = "事件模版类型", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CentereventTEventtypeMonitor centereventTEventtypeMonitor) {
-        return toAjax(iCentereventTEventtypemonitorService.insertCentereventTEventtypeMonitor(centereventTEventtypeMonitor));
+        return toAjax(centereventTEventtypemonitorService.insertCentereventTEventtypeMonitor(centereventTEventtypeMonitor));
     }
 
     /**
@@ -124,7 +83,7 @@ public class CentereventTEventtypeMonitorController extends BaseController {
     @Log(title = "事件模版类型", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CentereventTEventtypeMonitor centereventTEventtypeMonitor) {
-        return toAjax(iCentereventTEventtypemonitorService.updateCentereventTEventtypeMonitor(centereventTEventtypeMonitor));
+        return toAjax(centereventTEventtypemonitorService.updateCentereventTEventtypeMonitor(centereventTEventtypeMonitor));
     }
 
     /**
@@ -134,11 +93,26 @@ public class CentereventTEventtypeMonitorController extends BaseController {
     @Log(title = "事件模版类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{id}")
     public AjaxResult remove(@PathVariable Long id) {
-//        List<CentereventTEventtypeMonitor> eventtypeMonitors = iCentereventTEventtypemonitorService.selectCentereventTEventtypeMonitorByParentId(id);
-//        if(eventtypeMonitors != null && eventtypeMonitors.size() > 0){
-//           return  AjaxResult.error("该目录下面有小类，不允许删除!");
-//        }
-        return toAjax(iCentereventTEventtypemonitorService.deleteCentereventTEventtypeMonitorById(id));
+        return toAjax(centereventTEventtypemonitorService.deleteCentereventTEventtypeMonitorById(id));
     }
 
+    @ApiOperation("查询事件类型模版树结构")
+    @GetMapping("/getCentereventTEventtypemonitorTree/{templateType}")
+    public R getCentereventTEventtypemonitorTree(@PathVariable("templateType") String templateType) {
+        return R.ok(centereventTEventtypemonitorService.getCentereventTEventtypemonitorTree(templateType));
+    }
+
+    @RequiresPermissions("eventtypemonitor:eventtypemonitor:add")
+    @Log(title = "事件类型增加小类", businessType = BusinessType.INSERT)
+    @PostMapping("/saveTypelx")
+    public AjaxResult saveTypelx(@RequestBody String data) {
+        List<CentereventTEventtypeMonitor> centereventTEventtypeMonitors = JSON.parseArray(data, CentereventTEventtypeMonitor.class);
+        return toAjax(centereventTEventtypemonitorService.saveTypelx(centereventTEventtypeMonitors));
+    }
+
+    @ApiOperation("查询事件模版分类数量")
+    @PostMapping("/getEventByEventTypemonitor")
+    public R getEventByEventTypemonitor(@RequestBody VisuForestCloudMapVO visuForestCloudMapVO) {
+        return R.ok(centereventTEventtypemonitorService.getEventByEventType(visuForestCloudMapVO));
+    }
 }

src/main/java/com/sooka/sponest/event/centereventteventtypemonitor/domain/CentereventTEventtypeMonitor.java

@@ -11,44 +11,60 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @Description: com.sooka.sponest.event.centereventteventtypemonitor.domain
  * @version: 1.0
  */
+
 /**
  * 事件模版类型对象 centerevent_t_eventtype_monitor
  *
  * @author ruoyi
  * @date 2023-07-01
  */
-public class CentereventTEventtypeMonitor extends BaseEntity
-{
+public class CentereventTEventtypeMonitor extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键id */
+    /**
+     * 主键id
+     */
     private Long id;
 
-    /** 事件类型名称 */
+    /**
+     * 事件类型名称
+     */
     @Excel(name = "事件类型名称")
     private String eventTypeName;
 
-    /** 父类 */
+    /**
+     * 父类
+     */
     @Excel(name = "父类")
     private Long parentId;
 
-    /** 序号 */
+    /**
+     * 序号
+     */
     @Excel(name = "序号")
     private String serialNumber;
 
-    /** 模版类型 */
+    /**
+     * 模版类型
+     */
     @Excel(name = "模版类型")
     private String templateType;
 
-    /** 事件类型小类ID */
+    /**
+     * 事件类型小类ID
+     */
     @Excel(name = "事件类型小类ID")
     private Long typeXlId;
 
-    /** 事件类型大类ID */
+    /**
+     * 事件类型大类ID
+     */
     @Excel(name = "事件类型大类ID")
     private Long typeDlId;
 
-    /** 事件大类名称 */
+    /**
+     * 事件大类名称
+     */
     @Excel(name = "事件大类名称")
     private String typeDlName;
 
@@ -72,82 +88,73 @@ public class CentereventTEventtypeMonitor extends BaseEntity
 
     private String lxids;
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
-    public void setEventTypeName(String eventTypeName)
-    {
+
+    public void setEventTypeName(String eventTypeName) {
         this.eventTypeName = eventTypeName;
     }
 
-    public String getEventTypeName()
-    {
+    public String getEventTypeName() {
         return eventTypeName;
     }
-    public void setParentId(Long parentId)
-    {
+
+    public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
 
-    public Long getParentId()
-    {
+    public Long getParentId() {
         return parentId;
     }
-    public void setSerialNumber(String serialNumber)
-    {
+
+    public void setSerialNumber(String serialNumber) {
         this.serialNumber = serialNumber;
     }
 
-    public String getSerialNumber()
-    {
+    public String getSerialNumber() {
         return serialNumber;
     }
-    public void setTemplateType(String templateType)
-    {
+
+    public void setTemplateType(String templateType) {
         this.templateType = templateType;
     }
 
-    public String getTemplateType()
-    {
+    public String getTemplateType() {
         return templateType;
     }
-    public void setTypeXlId(Long typeXlId)
-    {
+
+    public void setTypeXlId(Long typeXlId) {
         this.typeXlId = typeXlId;
     }
 
-    public Long getTypeXlId()
-    {
+    public Long getTypeXlId() {
         return typeXlId;
     }
-    public void setTypeDlId(Long typeDlId)
-    {
+
+    public void setTypeDlId(Long typeDlId) {
         this.typeDlId = typeDlId;
     }
 
-    public Long getTypeDlId()
-    {
+    public Long getTypeDlId() {
         return typeDlId;
     }
-    public void setTypeDlName(String typeDlName)
-    {
+
+    public void setTypeDlName(String typeDlName) {
         this.typeDlName = typeDlName;
     }
 
-    public String getTypeDlName()
-    {
+    public String getTypeDlName() {
         return typeDlName;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("eventTypeName", getEventTypeName())
                 .append("parentId", getParentId())

src/main/java/com/sooka/sponest/event/centereventteventtypemonitor/mapper/CentereventTEventtypeMonitorMapper.java

@@ -14,27 +14,21 @@ import java.util.Map;
  */
 public interface CentereventTEventtypeMonitorMapper {
 
-    List<Map<String,Object>> getCentereventTEventtypemonitorTree(String templateType);
-
-    List<Map<String, Object>> getEventByEventType(VisuForestCloudMapVO visuForestCloudMapVO);
-
     /**
-     * 查询事件模版类型
+     * 查询事件模版类型列表
      *
-     * @param id 事件模版类型主键
-     * @return 事件模版类型
+     * @param centereventTEventtypeMonitor 事件模版类型
+     * @return 事件模版类型集合
      */
-    public CentereventTEventtypeMonitor selectCentereventTEventtypeMonitorById(Long id);
-    public List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorByParentId(Long id);
-
+    List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorList(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
 
     /**
-     * 查询事件模版类型列表
+     * 查询事件模版类型
      *
-     * @param centereventTEventtypeMonitor 事件模版类型
-     * @return 事件模版类型集合
+     * @param id 事件模版类型主键
+     * @return 事件模版类型
      */
-    public List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorList(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
+    CentereventTEventtypeMonitor selectCentereventTEventtypeMonitorById(Long id);
 
     /**
      * 新增事件模版类型
@@ -42,7 +36,7 @@ public interface CentereventTEventtypeMonitorMapper {
      * @param centereventTEventtypeMonitor 事件模版类型
      * @return 结果
      */
-    public int insertCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
+    int insertCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
 
     /**
      * 修改事件模版类型
@@ -50,23 +44,11 @@ public interface CentereventTEventtypeMonitorMapper {
      * @param centereventTEventtypeMonitor 事件模版类型
      * @return 结果
      */
-    public int updateCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
+    int updateCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
 
-    /**
-     * 删除事件模版类型
-     *
-     * @param id 事件模版类型主键
-     * @return 结果
-     */
-    public int deleteCentereventTEventtypeMonitorById(Long id);
+    int deleteCentereventTEventtypeMonitorByParentId(String parentId);
 
-    /**
-     * 批量删除事件模版类型
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCentereventTEventtypeMonitorByIds(Long[] ids);
+    List<Map<String, Object>> getCentereventTEventtypemonitorTree(String templateType);
 
-    int deleteCentereventTEventtypeMonitorByParentId(String parentId);
+    List<Map<String, Object>> getEventByEventType(VisuForestCloudMapVO visuForestCloudMapVO);
 }

src/main/java/com/sooka/sponest/event/centereventteventtypemonitor/service/ICentereventTEventtypemonitorService.java

@@ -13,17 +13,6 @@ import java.util.Map;
  * @version: 1.0
  */
 public interface ICentereventTEventtypemonitorService {
-    List<Map<String, Object>> getCentereventTEventtypemonitorTree(String templateType);
-
-    List<Map<String, Object>> getEventByEventType(VisuForestCloudMapVO visuForestCloudMapVO);
-
-    /**
-     * 查询事件模版类型
-     *
-     * @param id 事件模版类型主键
-     * @return 事件模版类型
-     */
-    public CentereventTEventtypeMonitor selectCentereventTEventtypeMonitorById(Long id);
 
     /**
      * 查询事件模版类型列表
@@ -31,31 +20,31 @@ public interface ICentereventTEventtypemonitorService {
      * @param centereventTEventtypeMonitor 事件模版类型
      * @return 事件模版类型集合
      */
-    public List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorList(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
+    List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorList(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
 
     /**
-     * 新增事件模版类型
+     * 查询事件模版类型
      *
-     * @param centereventTEventtypeMonitor 事件模版类型
-     * @return 结果
+     * @param id 事件模版类型主键
+     * @return 事件模版类型
      */
-    public int insertCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
+    CentereventTEventtypeMonitor selectCentereventTEventtypeMonitorById(Long id);
 
     /**
-     * 修改事件模版类型
+     * 新增事件模版类型
      *
      * @param centereventTEventtypeMonitor 事件模版类型
      * @return 结果
      */
-    public int updateCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
+    int insertCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
 
     /**
-     * 批量删除事件模版类型
+     * 修改事件模版类型
      *
-     * @param ids 需要删除的事件模版类型主键集合
+     * @param centereventTEventtypeMonitor 事件模版类型
      * @return 结果
      */
-    public int deleteCentereventTEventtypeMonitorByIds(Long[] ids);
+    int updateCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor);
 
     /**
      * 删除事件模版类型信息
@@ -63,8 +52,11 @@ public interface ICentereventTEventtypemonitorService {
      * @param id 事件模版类型主键
      * @return 结果
      */
-    public int deleteCentereventTEventtypeMonitorById(Long id);
+    int deleteCentereventTEventtypeMonitorById(Long id);
+
+    List<Map<String, Object>> getCentereventTEventtypemonitorTree(String templateType);
 
     int saveTypelx(List<CentereventTEventtypeMonitor> centereventTEventtypeMonitor);
-    public List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorByParentId(Long id);
+
+    List<Map<String, Object>> getEventByEventType(VisuForestCloudMapVO visuForestCloudMapVO);
 }

src/main/java/com/sooka/sponest/event/centereventteventtypemonitor/service/impl/ICentereventTEventtypemonitorServiceImpl.java

@@ -25,13 +25,69 @@ import java.util.Map;
  * @version: 1.0
  */
 @Service
-public class ICentereventTEventtypemonitorServiceImpl extends BaseService implements ICentereventTEventtypemonitorService {
+public class CentereventTEventtypemonitorServiceImpl extends BaseService implements ICentereventTEventtypemonitorService {
+
     @Autowired
     private CentereventTEventtypeMonitorMapper centereventTEventtypeMonitorMapper;
 
     @Autowired
     private CentereventTEventtypeMapper centereventTEventtypeMapper;
 
+    /**
+     * 查询事件模版类型列表
+     *
+     * @param centereventTEventtypeMonitor 事件模版类型
+     * @return 事件模版类型
+     */
+    @Override
+    public List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorList(CentereventTEventtypeMonitor centereventTEventtypeMonitor) {
+        return centereventTEventtypeMonitorMapper.selectCentereventTEventtypeMonitorList(centereventTEventtypeMonitor);
+    }
+
+    /**
+     * 查询事件模版类型
+     *
+     * @param id 事件模版类型主键
+     * @return 事件模版类型
+     */
+    @Override
+    public CentereventTEventtypeMonitor selectCentereventTEventtypeMonitorById(Long id) {
+        return centereventTEventtypeMonitorMapper.selectCentereventTEventtypeMonitorById(id);
+    }
+
+    /**
+     * 新增事件模版类型
+     *
+     * @param centereventTEventtypeMonitor 事件模版类型
+     * @return 结果
+     */
+    @Override
+    public int insertCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor) {
+        return centereventTEventtypeMonitorMapper.insertCentereventTEventtypeMonitor(centereventTEventtypeMonitor);
+    }
+
+    /**
+     * 修改事件模版类型
+     *
+     * @param centereventTEventtypeMonitor 事件模版类型
+     * @return 结果
+     */
+    @Override
+    public int updateCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor) {
+        return centereventTEventtypeMonitorMapper.updateCentereventTEventtypeMonitor(centereventTEventtypeMonitor);
+    }
+
+    /**
+     * 删除事件模版类型信息
+     *
+     * @param id 事件模版类型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCentereventTEventtypeMonitorById(Long id) {
+        return centereventTEventtypeMonitorMapper.deleteCentereventTEventtypeMonitorByParentId(String.valueOf(id));
+    }
+
     @Override
     public List<Map<String, Object>> getCentereventTEventtypemonitorTree(String templateType) {
         List<Map<String, Object>> bigList = new ArrayList<>();
@@ -42,7 +98,6 @@ public class ICentereventTEventtypemonitorServiceImpl extends BaseService implem
                 List<Map<String, Object>> smallList = new ArrayList<>();
                 bigType.put("value", map.get("id"));
                 bigType.put("label", map.get("event_type_name"));
-
                 for (Map<String, Object> map1 : mapList) {
                     if (map1.get("parent_id").equals(map.get("id").toString())) {
                         Map<String, Object> smallType = new HashMap<>();
@@ -52,12 +107,13 @@ public class ICentereventTEventtypemonitorServiceImpl extends BaseService implem
                     }
                 }
                 bigType.put("children", smallList);
-                bigType.put("count",smallList.size());
+                bigType.put("count", smallList.size());
                 bigList.add(bigType);
             }
         }
         return bigList;
     }
+
     @DataScopeMutiDept(deptAlias = "c")
     @Override
     public List<Map<String, Object>> getEventByEventType(VisuForestCloudMapVO visuForestCloudMapVO) {
@@ -65,14 +121,14 @@ public class ICentereventTEventtypemonitorServiceImpl extends BaseService implem
         List<Map<String, Object>> bigList = new ArrayList<>();
         List<Map<String, Object>> mapList = centereventTEventtypeMonitorMapper.getEventByEventType(visuForestCloudMapVO);
         for (Map<String, Object> map : mapList) {
-            if (0 == MapUtils.getLong(map,"parent_id")) {
+            if (0 == MapUtils.getLong(map, "parent_id")) {
                 Map<String, Object> bigType = new HashMap<>();
                 List<Map<String, Object>> smallList = new ArrayList<>();
                 bigType.put("id", map.get("id"));
                 bigType.put("event_type_name", map.get("event_type_name"));
-                Long sum=0L;
+                Long sum = 0L;
                 for (Map<String, Object> map1 : mapList) {
-                    if (MapUtils.getString(map1,"parent_id").equals(MapUtils.getString(map,"id"))) {
+                    if (MapUtils.getString(map1, "parent_id").equals(MapUtils.getString(map, "id"))) {
                         Map<String, Object> smallType = new HashMap<>();
                         smallType.put("id", map1.get("id"));
                         smallType.put("parent_id", map1.get("parent_id"));
@@ -82,7 +138,7 @@ public class ICentereventTEventtypemonitorServiceImpl extends BaseService implem
                         smallType.put("typeDlId", map1.get("typeDlId"));
                         smallType.put("typeDlName", map1.get("typeDlName"));
                         smallList.add(smallType);
-                        sum=sum+MapUtils.getLong(map1,"nums");
+                        sum = sum + MapUtils.getLong(map1, "nums");
                     }
                 }
                 bigType.put("children", smallList);
@@ -92,104 +148,23 @@ public class ICentereventTEventtypemonitorServiceImpl extends BaseService implem
         }
         return bigList;
     }
-    /**
-     * 查询事件模版类型
-     *
-     * @param id 事件模版类型主键
-     * @return 事件模版类型
-     */
-    @Override
-    public CentereventTEventtypeMonitor selectCentereventTEventtypeMonitorById(Long id)
-    {
-        return centereventTEventtypeMonitorMapper.selectCentereventTEventtypeMonitorById(id);
-    }
-
-    /**
-     * 查询事件模版类型列表
-     *
-     * @param centereventTEventtypeMonitor 事件模版类型
-     * @return 事件模版类型
-     */
-    @Override
-    public List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorList(CentereventTEventtypeMonitor centereventTEventtypeMonitor)
-    {
-        return centereventTEventtypeMonitorMapper.selectCentereventTEventtypeMonitorList(centereventTEventtypeMonitor);
-    }
-
-    /**
-     * 新增事件模版类型
-     *
-     * @param centereventTEventtypeMonitor 事件模版类型
-     * @return 结果
-     */
-    @Override
-    public int insertCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor)
-    {
-        return centereventTEventtypeMonitorMapper.insertCentereventTEventtypeMonitor(centereventTEventtypeMonitor);
-    }
 
-    /**
-     * 修改事件模版类型
-     *
-     * @param centereventTEventtypeMonitor 事件模版类型
-     * @return 结果
-     */
-    @Override
-    public int updateCentereventTEventtypeMonitor(CentereventTEventtypeMonitor centereventTEventtypeMonitor)
-    {
-        return centereventTEventtypeMonitorMapper.updateCentereventTEventtypeMonitor(centereventTEventtypeMonitor);
-    }
-
-    /**
-     * 批量删除事件模版类型
-     *
-     * @param ids 需要删除的事件模版类型主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEventtypeMonitorByIds(Long[] ids)
-    {
-        return centereventTEventtypeMonitorMapper.deleteCentereventTEventtypeMonitorByIds(ids);
-    }
-
-    /**
-     * 删除事件模版类型信息
-     *
-     * @param id 事件模版类型主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTEventtypeMonitorById(Long id)
-    {
-        return centereventTEventtypeMonitorMapper.deleteCentereventTEventtypeMonitorByParentId(String.valueOf(id));
-    }
-
-    @Override
     @Transactional
+    @Override
     public int saveTypelx(List<CentereventTEventtypeMonitor> centereventTEventtypeMonitor) {
-        int result=0;
-        result=centereventTEventtypeMonitorMapper.deleteCentereventTEventtypeMonitorByParentId(String.valueOf(centereventTEventtypeMonitor.get(0).getParentId()));
-
-        for (CentereventTEventtypeMonitor monitor:centereventTEventtypeMonitor){
-            if(!"1".equals(String.valueOf(monitor.getTypeXlId()))){//火情事件
+        int result = centereventTEventtypeMonitorMapper.deleteCentereventTEventtypeMonitorByParentId(String.valueOf(centereventTEventtypeMonitor.get(0).getParentId()));
+        for (CentereventTEventtypeMonitor monitor : centereventTEventtypeMonitor) {
+            if (!"1".equals(String.valueOf(monitor.getTypeXlId()))) {//火情事件
                 CentereventTEventtype eventtype = centereventTEventtypeMapper.selectCentereventTEventtypeById(String.valueOf(monitor.getTypeXlId()));
                 eventtype = centereventTEventtypeMapper.selectCentereventTEventtypeById(eventtype.getParentId());
                 monitor.setTypeDlId(Long.parseLong(eventtype.getId()));
                 monitor.setTypeDlName(eventtype.getEventTypeName());
-
-            }else{
+            } else {
                 monitor.setTypeDlId(0L);
                 monitor.setTypeDlName("火情事件");
             }
-            result=centereventTEventtypeMonitorMapper.insertCentereventTEventtypeMonitor(monitor);
+            result = centereventTEventtypeMonitorMapper.insertCentereventTEventtypeMonitor(monitor);
         }
         return result;
     }
-
-    @Override
-    public List<CentereventTEventtypeMonitor> selectCentereventTEventtypeMonitorByParentId(Long id) {
-        return centereventTEventtypeMonitorMapper.selectCentereventTEventtypeMonitorByParentId(id);
-    }
-
-
 }

src/main/resources/mapper/centereventteventtypemonitor/centereventteventtypemonitorMapper.xml

@@ -4,72 +4,108 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.sponest.event.centereventteventtypemonitor.mapper.CentereventTEventtypeMonitorMapper">
 
+    <resultMap type="CentereventTEventtypeMonitor" id="CentereventTEventtypeMonitorResult">
+        <result property="id" column="id"/>
+        <result property="eventTypeName" column="event_type_name"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="serialNumber" column="serial_number"/>
+        <result property="templateType" column="template_type"/>
+        <result property="typeXlId" column="type_xl_id"/>
+        <result property="typeDlId" column="type_dl_id"/>
+        <result property="typeDlName" column="type_dl_name"/>
+        <result property="lxnames" column="lxnames"/>
+        <result property="lxids" column="lxids"/>
+    </resultMap>
+
     <sql id="selectCentereventTEventtypeMonitorVo">
         select id, event_type_name, parent_id, serial_number, template_type, type_xl_id, type_dl_id, type_dl_name from centerevent_t_eventtype_monitor
     </sql>
 
-    <sql id="selectCentereventTEventtypeMonitorSql">
-        select id, event_type_name, parent_id, serial_number, template_type, type_xl_id, type_dl_id, type_dl_name
-    </sql>
-
-    <resultMap type="CentereventTEventtypeMonitor" id="CentereventTEventtypeMonitorResult">
-        <result property="id"    column="id"    />
-        <result property="eventTypeName"    column="event_type_name"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="serialNumber"    column="serial_number"    />
-        <result property="templateType"    column="template_type"    />
-        <result property="typeXlId"    column="type_xl_id"    />
-        <result property="typeDlId"    column="type_dl_id"    />
-        <result property="typeDlName"    column="type_dl_name"    />
-        <result property="lxnames"    column="lxnames"    />
-        <result property="lxids"    column="lxids"    />
-
-    </resultMap>
+    <select id="selectCentereventTEventtypeMonitorList" parameterType="CentereventTEventtypeMonitor"
+            resultMap="CentereventTEventtypeMonitorResult">
+        select id, event_type_name, parent_id, serial_number, template_type, type_xl_id, type_dl_id, type_dl_name,
+        etd.lxids, etd.lxnames from centerevent_t_eventtype_monitor et
+        left join (
+        select rr.parent_id parentId,GROUP_CONCAT(rr.type_xl_id) lxids,GROUP_CONCAT(rr.event_type_name) lxnames
+        from centerevent_t_eventtype_monitor rr
+        group by rr.parent_id) etd on etd.parentId = et.id
+        <where>
+            <if test="eventTypeName != null  and eventTypeName != ''">and event_type_name like concat('%',
+                #{eventTypeName}, '%')
+            </if>
+            <if test="parentId != null ">and parent_id = #{parentId}</if>
+            <if test="serialNumber != null  and serialNumber != ''">and serial_number = #{serialNumber}</if>
+            <if test="templateType != null  and templateType != ''">and template_type = #{templateType}</if>
+            <if test="typeXlId != null ">and type_xl_id = #{typeXlId}</if>
+            <if test="typeDlId != null ">and type_dl_id = #{typeDlId}</if>
+            <if test="typeDlName != null  and typeDlName != ''">and type_dl_name like concat('%', #{typeDlName}, '%')
+            </if>
+        </where>
+    </select>
 
-    <select id="getCentereventTEventtypemonitorTree" parameterType="string" resultType="java.util.Map">
-       SELECT id,event_type_name,parent_id,serial_number FROM centerevent_t_eventtype_monitor where  template_type=#{templateType}
+    <select id="selectCentereventTEventtypeMonitorById" parameterType="Long"
+            resultMap="CentereventTEventtypeMonitorResult">
+        <include refid="selectCentereventTEventtypeMonitorVo"/>
+        where id = #{id}
     </select>
 
-    <insert id="insertCentereventTEventtypemonitor" parameterType="CentereventTEventtypeMonitor">
+    <insert id="insertCentereventTEventtypeMonitor" parameterType="CentereventTEventtypeMonitor">
         insert into centerevent_t_eventtype_monitor
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="eventTypeName != null">event_type_name,</if>
             <if test="parentId != null">parent_id,</if>
-            <if test="code != null">code,</if>
-            <if test="reminderTime != null">reminder_time,</if>
+            <if test="serialNumber != null">serial_number,</if>
+            <if test="templateType != null">template_type,</if>
+            <if test="typeXlId != null">type_xl_id,</if>
+            <if test="typeDlId != null">type_dl_id,</if>
+            <if test="typeDlName != null">type_dl_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="eventTypeName != null">#{eventTypeName},</if>
             <if test="parentId != null">#{parentId},</if>
-            <if test="code != null">#{code},</if>
-            <if test="reminderTime != null">#{reminderTime},</if>
+            <if test="serialNumber != null">#{serialNumber},</if>
+            <if test="templateType != null">#{templateType},</if>
+            <if test="typeXlId != null">#{typeXlId},</if>
+            <if test="typeDlId != null">#{typeDlId},</if>
+            <if test="typeDlName != null">#{typeDlName},</if>
         </trim>
     </insert>
 
-    <update id="updateCentereventTEventtypemonitor" parameterType="CentereventTEventtypeMonitor">
+    <update id="updateCentereventTEventtypeMonitor" parameterType="CentereventTEventtypeMonitor">
         update centerevent_t_eventtype_monitor
         <trim prefix="SET" suffixOverrides=",">
             <if test="eventTypeName != null">event_type_name = #{eventTypeName},</if>
             <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="code != null">code = #{code},</if>
-            <if test="reminderTime != null">reminder_time = #{reminderTime},</if>
+            <if test="serialNumber != null">serial_number = #{serialNumber},</if>
+            <if test="templateType != null">template_type = #{templateType},</if>
+            <if test="typeXlId != null">type_xl_id = #{typeXlId},</if>
+            <if test="typeDlId != null">type_dl_id = #{typeDlId},</if>
+            <if test="typeDlName != null">type_dl_name = #{typeDlName},</if>
         </trim>
         where id = #{id}
     </update>
 
+    <delete id="deleteCentereventTEventtypeMonitorByParentId" parameterType="String">
+        delete from centerevent_t_eventtype_monitor where parent_id = #{parentId}
+    </delete>
+
+    <select id="getCentereventTEventtypemonitorTree" parameterType="string" resultType="java.util.Map">
+       SELECT id, event_type_name, parent_id, serial_number FROM centerevent_t_eventtype_monitor where template_type = #{templateType}
+    </select>
+
     <select id="getEventByEventType" parameterType="VisuForestCloudMapVO" resultType="map">
         SELECT
         moni.id,
         moni.parent_id,
         moni.event_type_name,
-        IFNULL(b.VALUE,0) AS nums,
-        moni.type_xl_id AS typeXlId,
-        moni.type_dl_id AS typeDlId,
-        moni.type_dl_name AS typeDlName
-
-        from centerevent_t_eventtype_monitor  moni left join (
+        IFNULL(b.VALUE,0) nums,
+        moni.type_xl_id typeXlId,
+        moni.type_dl_id typeDlId,
+        moni.type_dl_name typeDlName
+        from centerevent_t_eventtype_monitor moni
+        left join (
         select IFNULL(id,0) id,IFNULL(parent_id,1) parentId,IFNULL(event_type_name,'火情事件') name,count(*) value from (
         select y.id,y.parent_id,event_type_name from (
         <if test="isHgj != null and isHgj == 'false'">
@@ -112,83 +148,6 @@
         group by a.event_code) t
         group by event_type_name
         order by id
-        ) b on moni.type_xl_id=b.id where moni.template_type=#{templateType}
-    </select>
-
-    <select id="selectCentereventTEventtypeMonitorList" parameterType="CentereventTEventtypeMonitor" resultMap="CentereventTEventtypeMonitorResult">
-        <include refid="selectCentereventTEventtypeMonitorSql"/>,etd.lxids,etd.lxnames from centerevent_t_eventtype_monitor et
-        left join ( select  rr.parent_id as parentId,GROUP_CONCAT(rr.type_xl_id) as lxids,GROUP_CONCAT(rr.event_type_name) as lxnames from  centerevent_t_eventtype_monitor rr  group by rr.parent_id )
-        etd  on etd.parentId=et.id
-        <where>
-            <if test="eventTypeName != null  and eventTypeName != ''"> and event_type_name like concat('%', #{eventTypeName}, '%')</if>
-            <if test="parentId != null "> and parent_id = #{parentId}</if>
-            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
-            <if test="templateType != null  and templateType != ''"> and template_type = #{templateType}</if>
-            <if test="typeXlId != null "> and type_xl_id = #{typeXlId}</if>
-            <if test="typeDlId != null "> and type_dl_id = #{typeDlId}</if>
-            <if test="typeDlName != null  and typeDlName != ''"> and type_dl_name like concat('%', #{typeDlName}, '%')</if>
-        </where>
-    </select>
-
-    <select id="selectCentereventTEventtypeMonitorById" parameterType="Long" resultMap="CentereventTEventtypeMonitorResult">
-        <include refid="selectCentereventTEventtypeMonitorVo"/>
-        where id = #{id}
+        ) b on moni.type_xl_id=b.id where moni.template_type = #{templateType}
     </select>
-    <select id="selectCentereventTEventtypeMonitorByParentId" parameterType="Long" resultMap="CentereventTEventtypeMonitorResult">
-        <include refid="selectCentereventTEventtypeMonitorVo"/>
-        where parent_id = #{id}
-    </select>
-
-    <insert id="insertCentereventTEventtypeMonitor" parameterType="CentereventTEventtypeMonitor">
-        insert into centerevent_t_eventtype_monitor
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="eventTypeName != null">event_type_name,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="serialNumber != null">serial_number,</if>
-            <if test="templateType != null">template_type,</if>
-            <if test="typeXlId != null">type_xl_id,</if>
-            <if test="typeDlId != null">type_dl_id,</if>
-            <if test="typeDlName != null">type_dl_name,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="eventTypeName != null">#{eventTypeName},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="serialNumber != null">#{serialNumber},</if>
-            <if test="templateType != null">#{templateType},</if>
-            <if test="typeXlId != null">#{typeXlId},</if>
-            <if test="typeDlId != null">#{typeDlId},</if>
-            <if test="typeDlName != null">#{typeDlName},</if>
-        </trim>
-    </insert>
-
-    <update id="updateCentereventTEventtypeMonitor" parameterType="CentereventTEventtypeMonitor">
-        update centerevent_t_eventtype_monitor
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="eventTypeName != null">event_type_name = #{eventTypeName},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="serialNumber != null">serial_number = #{serialNumber},</if>
-            <if test="templateType != null">template_type = #{templateType},</if>
-            <if test="typeXlId != null">type_xl_id = #{typeXlId},</if>
-            <if test="typeDlId != null">type_dl_id = #{typeDlId},</if>
-            <if test="typeDlName != null">type_dl_name = #{typeDlName},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCentereventTEventtypeMonitorById" parameterType="Long">
-        delete from centerevent_t_eventtype_monitor where id = #{id}
-    </delete>
-
-    <delete id="deleteCentereventTEventtypeMonitorByIds" parameterType="String">
-        delete from centerevent_t_eventtype_monitor where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <delete id="deleteCentereventTEventtypeMonitorByParentId" parameterType="String">
-        delete from centerevent_t_eventtype_monitor where parent_id = #{parentId}
-    </delete>
 </mapper>