Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java

@@ -159,8 +159,8 @@ public class IcEnterpriseController implements ResultDataResolver {
      * @return
      */
     @PostMapping("delete/{enterpriseId}")
-    public Result delete(@PathVariable("enterpriseId") String enterpriseId) {
+    public Result delete(@LoginUser TokenDto tokenDto,@PathVariable("enterpriseId") String enterpriseId) {
-        icEnterpriseService.delete(enterpriseId);
+        icEnterpriseService.delete(enterpriseId,tokenDto.getCustomerId(),tokenDto.getUserId());
         return new Result();
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEnterpriseService.java

@@ -58,7 +58,7 @@ public interface IcEnterpriseService extends BaseService<IcEnterpriseEntity> {
      * @param enterpriseId
      * @return
      */
-    void delete(String enterpriseId);
+    void delete(String enterpriseId,String customerId,String userId);
 
     /**
      * 企事业单位列表

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java

@@ -2,7 +2,6 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.ImportGeneralDTO;
@@ -12,7 +11,6 @@ import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.entity.IcHouseEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 房屋信息
@@ -22,26 +20,6 @@ import java.util.Map;
  */
 public interface IcHouseService extends BaseService<IcHouseEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IcHouseDTO>
-     * @author generator
-     * @date 2021-10-25
-     */
-    PageData<IcHouseDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IcHouseDTO>
-     * @author generator
-     * @date 2021-10-25
-     */
-    List<IcHouseDTO> list(Map<String, Object> params);
-
     /**
      * 单条查询
      *
@@ -52,16 +30,6 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     IcHouseDTO get(String id);
 
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-10-25
-     */
-    void save(IcHouseDTO dto);
-
     /**
      * 默认更新
      *
@@ -72,16 +40,6 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     void update(IcHouseDTO dto);
 
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-10-25
-     */
-    void delete(String[] ids);
-
     /**
      * @Description 获取楼栋房屋列表
      * @Param formDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -116,9 +117,17 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             if (!staffInfo.getAgencyId().equals(origin.getAgencyId())) {
                 AgencyInfoCache orginAgencyInfo = CustomerOrgRedis.getAgencyInfo(origin.getAgencyId());
                 String agencyName = null != orginAgencyInfo ? orginAgencyInfo.getOrganizationName() : StrConstant.EPMETY_STR;
-                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", String.format("当前场所属于%s,您无权编辑", agencyName));
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", String.format("修改失败,当前场所属于%s", agencyName));
             }
             enterpriseEntity.setId(formDTO.getEnterpriseId());
+            //获取一下最新的巡检时间和巡检结果
+            LambdaQueryWrapper<IcEnterprisePatrolRecordEntity> queryWrapper = new LambdaQueryWrapper();
+            queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, enterpriseEntity.getId()).orderByDesc(IcEnterprisePatrolRecordEntity::getCreatedTime).last("limit 1");
+            IcEnterprisePatrolRecordEntity latestPatrol = enterprisePatrolRecordDao.selectOne(queryWrapper);
+            if (null != latestPatrol) {
+                enterpriseEntity.setLatestResult(latestPatrol.getResult());
+                enterpriseEntity.setLatestPatrolTime(latestPatrol.getPatrolTime());
+            }
             baseDao.updateById(enterpriseEntity);
         }
         return enterpriseEntity.getId();
@@ -134,8 +143,6 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
     @Override
     public String addOrUpdatePatrol(EnterprisePatrolFormDTO formDTO) {
         IcEnterprisePatrolRecordEntity patrolRecordEntity=ConvertUtils.sourceToTarget(formDTO,IcEnterprisePatrolRecordEntity.class);
-        //校验名称唯一
-        // todo
         if(StringUtils.isBlank(formDTO.getPatrolId())){
             enterprisePatrolRecordDao.insert(patrolRecordEntity);
         }else{
@@ -157,7 +164,7 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             sort++;
         }
         // 更新主表的最新结果和最新检查时间
-        baseDao.updateLatestPatrol(formDTO.getEnterpriseId(),patrolRecordEntity.getUpdatedTime(),patrolRecordEntity.getResult(),formDTO.getUserId());
+        baseDao.updateLatestPatrol(formDTO.getEnterpriseId(),patrolRecordEntity.getPatrolTime(),patrolRecordEntity.getResult(),formDTO.getUserId());
         return patrolRecordEntity.getId();
     }
 
@@ -169,10 +176,20 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void delPatrol(String patrolId,String currentUserId) {
+        IcEnterprisePatrolRecordEntity origin=enterprisePatrolRecordDao.selectById(patrolId);
+        if(null==origin){
+            return;
+        }
         //1、删除巡查记录
         enterprisePatrolRecordDao.deleteById(patrolId);
         //2、删除之前的图片
         enterprisePatrolAttachmentDao.deleteByPatrolId(patrolId,currentUserId);
+        //3、如果是记录清空，那主表的最近一次巡查时间和最新结果也置空
+        LambdaQueryWrapper<IcEnterprisePatrolRecordEntity> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId,origin.getEnterpriseId());
+        if (NumConstant.ZERO == enterprisePatrolRecordDao.selectCount(queryWrapper)) {
+            baseDao.updateLatestPatrol(origin.getEnterpriseId(),null,StrConstant.EPMETY_STR,currentUserId);
+        }
     }
 
     /**
@@ -234,10 +251,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void delete(String enterpriseId) {
+    public void delete(String enterpriseId, String customerId, String userId) {
-         //要删除的记录的agencyId要与当前登录用户的agencyId一致
+        //如果是编辑判断下权限要删除的记录的agencyId要与当前登录用户的agencyId一致
-         //ToDo
+        IcEnterpriseEntity origin = baseDao.selectById(enterpriseId);
-         baseDao.deleteById(enterpriseId);
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
+        if (!staffInfo.getAgencyId().equals(origin.getAgencyId())) {
+            AgencyInfoCache orginAgencyInfo = CustomerOrgRedis.getAgencyInfo(origin.getAgencyId());
+            String agencyName = null != orginAgencyInfo ? orginAgencyInfo.getOrganizationName() : StrConstant.EPMETY_STR;
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", String.format("删除失败，当前场所属于%s", agencyName));
+        }
+        baseDao.deleteById(enterpriseId);
     }
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -1,18 +1,14 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -20,7 +16,10 @@ import com.epmet.dao.IcBuildingDao;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dao.IcHouseDao;
 import com.epmet.dao.IcNeighborHoodDao;
-import com.epmet.dto.*;
+import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.IcResiCategoryStatsConfigDTO;
+import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.HouseListResultDTO;
@@ -32,7 +31,6 @@ import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.enums.HousePurposeEnums;
 import com.epmet.enums.HouseRentFlagEnums;
 import com.epmet.enums.HouseTypeEnums;
-import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.redis.IcHouseRedis;
@@ -61,8 +59,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     @Resource
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Resource
-    private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
-    @Resource
     private IcHouseRedis icHouseRedis;
     @Resource
     private IcNeighborHoodDao icNeighborHoodDao;
@@ -72,31 +68,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     private IcBuildingUnitDao buildingUnitDao;
 
 
-    @Override
-    public PageData<IcHouseDTO> page(Map<String, Object> params) {
-        IPage<IcHouseEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IcHouseDTO.class);
-    }
-
-    @Override
-    public List<IcHouseDTO> list(Map<String, Object> params) {
-        List<IcHouseEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IcHouseDTO.class);
-    }
-
-    private QueryWrapper<IcHouseEntity> getWrapper(Map<String, Object> params) {
-        String id = (String) params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IcHouseEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
     @Override
     public IcHouseDTO get(String id) {
         IcHouseEntity entity = baseDao.selectById(id);
@@ -122,13 +93,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return dto;
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IcHouseDTO dto) {
-        IcHouseEntity entity = ConvertUtils.sourceToTarget(dto, IcHouseEntity.class);
-        insert(entity);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcHouseDTO dto) {
@@ -136,12 +100,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         updateById(entity);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
 
     /**
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java

@@ -93,7 +93,7 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl<IcPlaceOrgDao, IcPlac
         if (!staffInfo.getAgencyId().equals(entity.getAgencyId())) {
             AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(entity.getAgencyId());
             String agencyName = null != agencyInfoCache ? agencyInfoCache.getOrganizationName() : StrConstant.EPMETY_STR;
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", String.format("当前九小场所属于%s,您无权编辑", agencyName));
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", String.format("编辑失败，当前九小场所属于%s", agencyName));
         }
         entity = ConvertUtils.sourceToTarget(formDTO, IcPlaceOrgEntity.class);
         entity.setId(formDTO.getPlaceOrgId());

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml

@@ -38,6 +38,9 @@
         <if test="category != null and category != '' ">
             AND category = #{category}
         </if>
+        <if test="dangerType != null and dangerType != '' ">
+            AND danger_type = #{dangerType}
+        </if>
         ORDER BY created_time DESC
     </select>
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml

@@ -31,7 +31,7 @@
         update ic_enterprise
         set LATEST_RESULT = #{result},
             UPDATED_BY = #{userId},
-            UPDATED_TIME=NOW(),
+            UPDATED_TIME = NOW(),
             LATEST_PATROL_TIME = #{updatedTime}
         WHERE ID = #{enterpriseId}
     </update>