2022-08-15 化学品权限补充。

zd-common/zd-common-core/src/main/java/com/zd/common/core/domain/per/PerPrefix.java

@@ -626,6 +626,8 @@ public class PerPrefix {
 
     public static final String HXP_STOCK = "chemical:hxpStock:";
 
+    public static final String HXP_STOCKDETAIL = "chemical:hxpStockDetail:";
+
     public static final String HXP_STOCKJOIN = "chemical:hxpStockJoin:";
 
     public static final String HXP_STOCKOUT = "chemical:hxpStockOut:";

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpStockController.java

@@ -74,7 +74,7 @@ public class HxpStockController extends BaseController {
     /**
      * 查询库存管理列表(库存明细)
      */
-    @PreAuthorize(hasPermi = PerPrefix.HXP_STOCK+ PerFun.LISTDETAIL)
+    @PreAuthorize(hasPermi = PerPrefix.HXP_STOCKDETAIL+ PerFun.LISTDETAIL)
     @GetMapping("/listDetail")
     @ApiOperation(value = "查询库存管理列表(库存明细)")
     public TableDataInfo<HxpStockDetailVO> listDetail(HxpStockSearch hxpStockSearch) {

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpAlarmRecordSearch.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @date 2022-06-16
  */
 @ApiModel("化学品报警记录")
-public class HxpAlarmRecordSearch {
+public class HxpAlarmRecordSearch  extends BaseEntity{
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "关键字搜索")

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpCabinetSearch.java

@@ -1,5 +1,6 @@
 package com.zd.chemical.domain.vo;
 
+import com.zd.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,7 +14,7 @@ import java.util.List;
  * @date 2022-06-16
  */
 @ApiModel("化学品和机柜关联")
-public class HxpCabinetSearch {
+public class HxpCabinetSearch  extends BaseEntity{
     private static final long serialVersionUID = 1L;
 
     /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpChemicalSearch.java

@@ -1,5 +1,6 @@
 package com.zd.chemical.domain.vo;
 
+import com.zd.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -12,7 +13,7 @@ import java.util.List;
  * @date 2022-06-16
  */
 @ApiModel("化学品信息查询过滤条件")
-public class HxpChemicalSearch {
+public class HxpChemicalSearch  extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "关键字搜索")

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpAlarmRecordServiceImpl.java

@@ -6,9 +6,11 @@ import com.zd.chemical.domain.vo.AioAlarmRecordVo;
 import com.zd.chemical.domain.vo.HxpAlarmRecordSearch;
 import com.zd.chemical.domain.vo.HxpAlarmRecordVo;
 import com.zd.chemical.domain.vo.HxpCabinetVo;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
+import com.zd.common.datascope.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.chemical.mapper.HxpAlarmRecordMapper;
@@ -44,6 +46,7 @@ public class HxpAlarmRecordServiceImpl implements IHxpAlarmRecordService {
      * @return 化学品报警记录
      */
     @Override
+    @DataScope(deptAlias = "st", permi = PerPrefix.HXP_ALARMRECORD)
     public List<HxpAlarmRecordVo> selectHxpAlarmRecordList(HxpAlarmRecordSearch hxpAlarmRecordSearch) {
         return hxpAlarmRecordMapper.selectHxpAlarmRecordList(hxpAlarmRecordSearch);
     }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpCabinetServiceImpl.java

@@ -11,11 +11,13 @@ import com.zd.chemical.mapper.HxpCabinetlockLogMapper;
 import com.zd.chemical.service.IHxpCabinetlockLogService;
 import com.zd.common.core.constant.HttpStatus;
 import com.zd.common.core.domain.R;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.enums.LockTypeEnum;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
+import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.utils.SaveUtil;
 
 import com.zd.common.swagger.config.AppListener;
@@ -77,6 +79,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
      * @return 化学品机柜管理信息
      */
     @Override
+    @DataScope(deptAlias = "st", userAlias = "ct", permi = PerPrefix.HXP_CABINET)
     public List <HxpCabinetVo> selectHxpCabinetList(HxpCabinetSearch hxpCabinetSearch) {
         List <HxpCabinetVo> hxpCabinetVos = hxpCabinetMapper.selectHxpCabinetList(hxpCabinetSearch);
         Function <List <HxpCabinetVo>, List <Long>> function = x -> x.parallelStream().map(HxpCabinetVo::getId).collect(Collectors.toList());

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -7,11 +7,13 @@ import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.mapper.HxpChemicalClassifyMapper;
 import com.zd.chemical.mapper.HxpChemicalMapper;
 import com.zd.chemical.service.IHxpChemicalService;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.Pinyin4jUtil;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
+import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.utils.DictUtils;
 import com.zd.common.security.utils.SaveUtil;
 import com.zd.system.api.domain.SysDictData;
@@ -66,6 +68,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
      * @return 化学品信息
      */
     @Override
+    @DataScope(deptAlias = "su", userAlias = "su", permi = PerPrefix.HPX_CHEMICAL)
     public List<HxpChemicalVo> selectHxpChemicalList(HxpChemicalSearch hxpChemicalSearch) {
         List<HxpChemicalVo> hxpChemicalList = hxpChemicalMapper.selectHxpChemicalList(hxpChemicalSearch);
         return hxpChemicalList;

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -132,6 +132,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
      * @return 库存管理
      */
     @Override
+    @DataScope(deptAlias = "st", permi = PerPrefix.HXP_STOCKDETAIL)
     public List<HxpStockDetailVO> selectHxpStockListDetail(HxpStockSearch hxpStockSearch) {
         List<HxpStockDetailVO> list = hxpStockMapper.selectHxpStockListDetail(hxpStockSearch);
         return list;

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpAlarmRecordMapper.xml

@@ -102,6 +102,8 @@
                 AND ard.id IN
                 <foreach item="item" collection="ids" separator="," open="(" close=")" index="">'${item}'</foreach>
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by ard.handling_status asc,ard.alarm_time desc
     </select>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpCabinetMapper.xml

@@ -46,6 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  and deptId != ''"> and st.dept_id = #{deptId}</if>
             <if test="cabinetStatus != null "> and ct.cabinet_status = #{cabinetStatus}</if>
             <if test="subId != null "> and ct.sub_id = #{subId}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by ct.create_time desc
     </select>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpChemicalMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT ur.nick_name FROM sys_user ur WHERE ur.user_id = hc.user_id) create_by, hc.create_time,
         hc.update_by, hc.update_time, hc.remark,
         CASE WHEN hc.measuring_method = 1 THEN '重量' ELSE CASE WHEN hc.measuring_method = 2 THEN '体积' ELSE '个数' END END measuringMethodContent
-        from hxp_chemical hc
+        from hxp_chemical hc LEFT JOIN sys_user su ON hc.user_id = su.user_id
         <where>
             <if test="searchValue != null  and searchValue != ''">
              and (hc.chemical_name like concat('%',#{searchValue},'%') or hc.another_name like concat('%',#{searchValue},'%') or hc.cas_num like concat('%',#{searchValue},'%'))
@@ -60,6 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <foreach item="item" collection="ids" separator="," open="(" close=")" index="">'${item}'</foreach>
             </if>
             <if test="casNum != null "> and hc.cas_num = #{casNum}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by hc.create_time desc
     </select>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpStockMapper.xml

@@ -294,6 +294,8 @@
                 AND sk.id IN
                 <foreach item="item" collection="ids" separator="," open="(" close=")" index="">'${item}'</foreach>
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by sk.create_time desc
     </select>