未读消息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -26,8 +26,7 @@ import java.util.Set;
  * @author ruoyi
  */
 @RestController
-public class SysLoginController
-{
+public class SysLoginController {
     @Autowired
     private SysLoginService loginService;
 
@@ -44,12 +43,11 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
-    {
-		Map<String,Object> ajax = new HashMap<>();
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
+        Map<String, Object> ajax = new HashMap<>();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
+            loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
         return AjaxResult.success(ajax);
     }
@@ -59,15 +57,14 @@ public class SysLoginController
      *
      * @return 用户信息
      */
-    @GetMapping("getInfo")
-    public AjaxResult getInfo()
-    {
+    @GetMapping("/getInfo")
+    public AjaxResult getInfo() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-		Map<String,Object> ajax = new HashMap<>();
+        Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
@@ -79,9 +76,8 @@ public class SysLoginController
      *
      * @return 路由信息
      */
-    @GetMapping("getRouters")
-    public AjaxResult getRouters()
-    {
+    @GetMapping("/getRouters")
+    public AjaxResult getRouters() {
         String userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ChemicalDataController.java

@@ -0,0 +1,120 @@
+package com.ruoyi.web.controller.zhdd;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zhdd.domain.bo.ChemicalDataBo;
+import com.ruoyi.zhdd.domain.vo.ChemicalDataVo;
+import com.ruoyi.zhdd.service.IChemicalDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 危化品信息Controller
+ *
+ * @author xintong
+ * @date 2022-01-14
+ */
+@Validated
+@Api(value = "危化品信息控制器", tags = {"危化品信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/zhdd/chemicalData")
+public class ChemicalDataController extends BaseController {
+
+    private final IChemicalDataService iChemicalDataService;
+
+    /**
+     * 查询危化品信息列表
+     */
+    @ApiOperation("查询危化品信息列表")
+//    @PreAuthorize("@ss.hasPermi('zhdd:chemicalData:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ChemicalDataVo> list(@Validated(QueryGroup.class) ChemicalDataBo bo) {
+        return iChemicalDataService.queryPageList(bo);
+    }
+
+    /**
+     * 导出危化品信息列表
+     */
+    @ApiOperation("导出危化品信息列表")
+    @PreAuthorize("@ss.hasPermi('zhdd:chemicalData:export')")
+    @Log(title = "危化品信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated ChemicalDataBo bo, HttpServletResponse response) {
+        List<ChemicalDataVo> list = iChemicalDataService.queryList(bo);
+        ExcelUtil.exportExcel(list, "危化品信息", ChemicalDataVo.class, response);
+    }
+
+    /**
+     * 获取危化品信息详细信息
+     */
+    @ApiOperation("获取危化品信息详细信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:chemicalData:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<ChemicalDataVo> getInfo(@NotNull(message = "主键不能为空")
+                                              @PathVariable("id") String id) {
+        return AjaxResult.success(iChemicalDataService.queryById(id));
+    }
+
+    /**
+     * 新增危化品信息
+     */
+    @ApiOperation("新增危化品信息")
+//    @PreAuthorize("@ss.hasPermi('zhdd:chemicalData:add')")
+    @Log(title = "危化品信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody ChemicalDataBo bo) {
+        return toAjax(iChemicalDataService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改危化品信息
+     */
+    @ApiOperation("修改危化品信息")
+//    @PreAuthorize("@ss.hasPermi('zhdd:chemicalData:edit')")
+    @Log(title = "危化品信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody ChemicalDataBo bo) {
+        return toAjax(iChemicalDataService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除危化品信息
+     */
+    @ApiOperation("删除危化品信息")
+//    @PreAuthorize("@ss.hasPermi('zhdd:chemicalData:remove')")
+    @Log(title = "危化品信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                   @PathVariable String[] ids) {
+        return toAjax(iChemicalDataService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -6,6 +6,9 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -29,6 +32,7 @@ import com.ruoyi.zhdd.domain.vo.IncidentTaskCommandVo;
 import com.ruoyi.zhdd.domain.vo.IncidentTaskVo;
 import com.ruoyi.zhdd.domain.vo.IncidentVo;
 import com.ruoyi.zhdd.domain.vo.PlanVo;
+import com.ruoyi.zhdd.feign.FeignNoticeInfoService;
 import com.ruoyi.zhdd.service.IIncidentProcessService;
 import com.ruoyi.zhdd.service.IIncidentService;
 import com.ruoyi.zhdd.service.IIncidentTaskCommandService;
@@ -41,6 +45,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -88,6 +93,11 @@ public class IncidentController extends BaseController {
 
     private final ISysDictDataService sysDictDataService;
 
+    private final FeignNoticeInfoService feignNoticeInfoService;
+
+    @Value("${spring.profiles.active}")
+    private String env;
+
     /**
      * 查询事件基础列表
      */
@@ -130,8 +140,45 @@ public class IncidentController extends BaseController {
         }
         // 查询处置方案
         map.put("task", incidentTaskService.listTaskInfo(id));
-        map.put("process", iIncidentProcessService.list(Wrappers.<IncidentProcess>lambdaQuery()
-            .eq(IncidentProcess::getIncidentId, id).orderByAsc(IncidentProcess::getCreateTime)));
+        List<IncidentProcess> list = iIncidentProcessService.list(Wrappers.<IncidentProcess>lambdaQuery()
+            .eq(IncidentProcess::getIncidentId, id).orderByAsc(IncidentProcess::getCreateTime));
+        if (!"dev".equals(env)) {
+            for (IncidentProcess incidentProcess : list) {
+                if (incidentProcess.getStatus() == 1) {
+                    // 查询阅读情况
+                    JSONObject o = feignNoticeInfoService.messagePushInfoList("1", "2", incidentProcess.getId());
+                    System.out.println(o);
+                    // 解析
+                    if (ObjectUtil.isNotEmpty(o)) {
+                        Integer total = o.getInt("total");
+                        if (total > 0) {
+                            JSONArray jsonArray = JSONUtil.parseObj(o.getJSONArray("rows").get(0)).getJSONArray("messageReadInfoList");
+                            String unMessage = "";
+                            String message = "";
+                            for (Object o1 : jsonArray) {
+                                JSONObject jsonObject = JSONUtil.parseObj(o1);
+                                if ("0".equals(jsonObject.getStr("readState"))) {
+                                    // 未读
+                                    unMessage = jsonObject.getStr("nickName") + "、";
+                                } else if ("1".equals(jsonObject.getStr("readState"))) {
+                                    // 已读
+                                    message = jsonObject.getStr("nickName") + "、";
+                                }
+                            }
+                            // 循环完之后，去除最后一个顿号
+                            if (StrUtil.isNotBlank(unMessage)) {
+                                unMessage = StrUtil.removeSuffix(unMessage, "、") + "未读。";
+                            }
+                            if (StrUtil.isNotBlank(message)) {
+                                message = StrUtil.removeSuffix(message, "、") + "已读。";
+                            }
+                            incidentProcess.setUserRead(unMessage + message);
+                        }
+                    }
+                }
+            }
+        }
+        map.put("process", list);
         return AjaxResult.success(map);
     }
 
@@ -277,5 +324,4 @@ public class IncidentController extends BaseController {
         file.delete();
     }
 
-
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -73,7 +73,7 @@ public class LoginUser implements UserDetails {
      */
     private Set<String> permissions;
 
-    private Boolean suQian;
+    private Boolean suQian = false;
 
     /**
      * 用户信息

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -4,12 +4,8 @@ import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.context.request.async.TimeoutCallableProcessingInterceptor;
-import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
-import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -42,7 +38,7 @@ public class ResourcesConfig implements WebMvcConfigurer {
     @Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        CorsConfiguration config = new CorsConfiguration();
+        /*CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
         // 设置访问源地址
         config.addAllowedOrigin("*");
@@ -52,11 +48,11 @@ public class ResourcesConfig implements WebMvcConfigurer {
         // 设置访问源请求方法
         config.addAllowedMethod("*");
         // 对接口配置跨域设置
-        source.registerCorsConfiguration("/**", config);
+        source.registerCorsConfiguration("/**", config);*/
         return new CorsFilter(source);
     }
 
-    @Override
+    /*@Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**").
             allowedOrigins("*").allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE").
@@ -72,5 +68,5 @@ public class ResourcesConfig implements WebMvcConfigurer {
     @Bean
     public TimeoutCallableProcessingInterceptor timeoutInterceptor() {
         return new TimeoutCallableProcessingInterceptor();
-    }
+    }*/
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -37,7 +37,8 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
             authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
             SecurityContextHolder.getContext().setAuthentication(authenticationToken);
         }
-        response.addHeader("Access-Control-Allow-Origin", "*");
+//        response.addHeader("Access-Control-Allow-Origin", "*");
+//        response.addHeader("Access-Control-Allow-Headers", "*");
         chain.doFilter(request, response);
     }
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/ChemicalData.java

@@ -0,0 +1,71 @@
+package com.ruoyi.zhdd.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 危化品信息对象 b_chemical_data
+ *
+ * @author xintong
+ * @date 2022-01-14
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("b_chemical_data")
+public class ChemicalData implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 中文名称
+     */
+    private String name;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * $column.columnComment
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * $column.columnComment
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * $column.columnComment
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * $column.columnComment
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * $column.columnComment
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/IncidentProcess.java

@@ -1,12 +1,16 @@
 package com.ruoyi.zhdd.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
-import java.math.BigDecimal;
 
 /**
  * 事件处置流程对象 b_incident_process
@@ -20,7 +24,7 @@ import java.math.BigDecimal;
 @TableName("b_incident_process")
 public class IncidentProcess implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
 
     /**
@@ -56,4 +60,7 @@ public class IncidentProcess implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
+    @TableField(exist = false)
+    private String userRead;
+
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/SmsOutbox.java

@@ -21,7 +21,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @TableName("sms_outbox")
 public class SmsOutbox implements Serializable {
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @TableId(value = "sismsid", type = IdType.ASSIGN_ID)
     private String sismsid;
     private String extcode;
     private String destaddr;

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/ChemicalDataBo.java

@@ -0,0 +1,76 @@
+package com.ruoyi.zhdd.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 危化品信息业务对象 b_chemical_data
+ *
+ * @author xintong
+ * @date 2022-01-14
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("危化品信息业务对象")
+public class ChemicalDataBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 中文名称
+     */
+    @ApiModelProperty(value = "中文名称")
+    private String name;
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "$column.columnComment")
+    private String delFlag;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ChemicalDataVo.java

@@ -0,0 +1,42 @@
+package com.ruoyi.zhdd.domain.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 危化品信息视图对象 b_chemical_data
+ *
+ * @author xintong
+ * @date 2022-01-14
+ */
+@Data
+@ApiModel("危化品信息视图对象")
+public class ChemicalDataVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    private String id;
+
+    /**
+     * 中文名称
+     */
+    @Excel(name = "中文名称")
+    @ApiModelProperty("中文名称")
+    private String name;
+
+    /**
+     * 内容
+     */
+    @Excel(name = "内容")
+    @ApiModelProperty("内容")
+    private String content;
+
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentProcessVo.java

@@ -51,4 +51,5 @@ public class IncidentProcessVo {
     @Excel(name = "创建时间")
     @ApiModelProperty("创建时间")
     private Date createTime;
+
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/feign/FeignNoticeInfoService.java

@@ -1,10 +1,13 @@
 package com.ruoyi.zhdd.feign;
 
+import cn.hutool.json.JSONObject;
 import com.ruoyi.zhdd.domain.bo.MessagePushBo;
 import com.ruoyi.zhdd.feign.fallback.FeignNoticeInfoFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @Description: 联旺消息接口
@@ -18,4 +21,6 @@ public interface FeignNoticeInfoService {
     @PostMapping("/messagepushinfo")
     void messagePush(@RequestBody MessagePushBo messagePushBo);
 
+    @GetMapping("/messagepushinfo/list")
+    JSONObject messagePushInfoList(@RequestParam(value = "msSource") String msSource, @RequestParam(value = "msType") String msType, @RequestParam(value = "msNo") String msNo);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/feign/fallback/FeignNoticeInfoFallback.java

@@ -1,5 +1,6 @@
 package com.ruoyi.zhdd.feign.fallback;
 
+import cn.hutool.json.JSONObject;
 import com.ruoyi.zhdd.domain.bo.MessagePushBo;
 import com.ruoyi.zhdd.feign.FeignNoticeInfoService;
 import lombok.extern.slf4j.Slf4j;
@@ -19,4 +20,10 @@ public class FeignNoticeInfoFallback implements FeignNoticeInfoService {
     public void messagePush(MessagePushBo messagePushBo) {
         log.error("APP发送消息失败");
     }
+
+    @Override
+    public JSONObject messagePushInfoList(String msSource, String msType, String msNo) {
+        log.error("获取消息列表失败");
+        return null;
+    }
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/ChemicalDataMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.zhdd.mapper;
+
+import com.ruoyi.zhdd.domain.ChemicalData;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import org.apache.ibatis.annotations.CacheNamespace;
+
+/**
+ * 危化品信息Mapper接口
+ *
+ * @author xintong
+ * @date 2022-01-14
+ */
+public interface ChemicalDataMapper extends BaseMapperPlus<ChemicalData> {
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IChemicalDataService.java

@@ -0,0 +1,56 @@
+package com.ruoyi.zhdd.service;
+
+import com.ruoyi.zhdd.domain.ChemicalData;
+import com.ruoyi.zhdd.domain.vo.ChemicalDataVo;
+import com.ruoyi.zhdd.domain.bo.ChemicalDataBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 危化品信息Service接口
+ *
+ * @author xintong
+ * @date 2022-01-14
+ */
+public interface IChemicalDataService extends IServicePlus<ChemicalData, ChemicalDataVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ChemicalDataVo queryById(String id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<ChemicalDataVo> queryPageList(ChemicalDataBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<ChemicalDataVo> queryList(ChemicalDataBo bo);
+
+	/**
+	 * 根据新增业务对象插入危化品信息
+	 * @param bo 危化品信息新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(ChemicalDataBo bo);
+
+	/**
+	 * 根据编辑业务对象修改危化品信息
+	 * @param bo 危化品信息编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(ChemicalDataBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ChemicalDataServiceImpl.java

@@ -0,0 +1,85 @@
+package com.ruoyi.zhdd.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zhdd.domain.bo.ChemicalDataBo;
+import com.ruoyi.zhdd.domain.vo.ChemicalDataVo;
+import com.ruoyi.zhdd.domain.ChemicalData;
+import com.ruoyi.zhdd.mapper.ChemicalDataMapper;
+import com.ruoyi.zhdd.service.IChemicalDataService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 危化品信息Service业务层处理
+ *
+ * @author xintong
+ * @date 2022-01-14
+ */
+@Service
+public class ChemicalDataServiceImpl extends ServicePlusImpl<ChemicalDataMapper, ChemicalData, ChemicalDataVo> implements IChemicalDataService {
+
+    @Override
+    public ChemicalDataVo queryById(String id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<ChemicalDataVo> queryPageList(ChemicalDataBo bo) {
+        PagePlus<ChemicalData, ChemicalDataVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<ChemicalDataVo> queryList(ChemicalDataBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<ChemicalData> buildQueryWrapper(ChemicalDataBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ChemicalData> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), ChemicalData::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getContent()), ChemicalData::getContent, bo.getContent());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(ChemicalDataBo bo) {
+        ChemicalData add = BeanUtil.toBean(bo, ChemicalData.class);
+        validEntityBeforeSave(add);
+        return save(add);
+    }
+
+    @Override
+    public Boolean updateByBo(ChemicalDataBo bo) {
+        ChemicalData update = BeanUtil.toBean(bo, ChemicalData.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ChemicalData entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

ruoyi-zhdd/src/main/resources/mapper/zhdd/ChemicalDataMapper.xml

@@ -0,0 +1,19 @@
+<?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.ruoyi.zhdd.mapper.ChemicalDataMapper">
+
+    <resultMap type="com.ruoyi.zhdd.domain.ChemicalData" id="ChemicalDataResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="content" column="content"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+
+</mapper>

sql/20211209修改.sql

@@ -122,9 +122,31 @@ alter table b_incident_process
     alter column status set default 0;
 
 -- 以上已同步
+-- 2022-1-13
+alter table b_incident_task
+    add expr_json text;
+
+create table b_chemical_data
+(
+    id          varchar(36),
+    name        varchar(36),
+    content     text,
+    create_time timestamp(0),
+    create_by   varchar(64),
+    update_by   varchar(64),
+    update_time timestamp(0),
+    del_flag    char default '0'
+);
+comment
+on table b_chemical_data is '危化品信息';
+comment
+on column b_chemical_data.id is 'id';
+comment
+on column b_chemical_data.name is '中文名称';
+comment
+on column b_chemical_data.content is '内容';
 
-
-
+-- 以上已同步