Merge branches 'dev_ylfn' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ylfn

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java

@@ -1,10 +1,15 @@
 package com.epmet.commons.tools.utils;
 
 import com.epmet.commons.tools.enums.IdCardTypeEnum;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.ExceptionUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.DateTimeException;
+import java.time.LocalDate;
+import java.time.Period;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -50,6 +55,7 @@ public class IdCardRegexUtils {
         private String birthdayMonth;
         private String birthdayDay;
         private String sex;
+        private Integer age;
     }
 
     /**
@@ -116,7 +122,17 @@ public class IdCardRegexUtils {
             String month = matcher.group("month");
             String day = matcher.group("day");
             String sex = matcher.group("sex");
-            return new ParsedContent(year, month, day, sex);
+
+            // ------- 年龄Start----------
+            Integer age;
+            try {
+                LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
+                age = Period.between(birthday, LocalDate.now()).getYears();
+            } catch (DateTimeException e) {
+                throw new EpmetException("身份证号解析年龄失败:" + ExceptionUtils.getErrorStackTrace(e));
+            }
+            // ------- 年龄End----------
+            return new ParsedContent(year, month, day, sex, age);
         }
 
         // 其他类型暂时不可解析
@@ -130,4 +146,10 @@ public class IdCardRegexUtils {
     public IdCardTypeEnum getTypeEnum() {
         return idCardType;
     }
+
+    public static void main(String[] args) {
+        IdCardRegexUtils parse = IdCardRegexUtils.parse("370282198801303017");
+        ParsedContent parsedResult = parse.getParsedResult();
+        System.out.println(parsedResult);
+    }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/EnterprisePatrolRemindTask.java

@@ -0,0 +1,31 @@
+package com.epmet.task;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/9/6 17:35
+ */
+@Component("enterprisePatrolRemindTask")
+@Slf4j
+public class EnterprisePatrolRemindTask implements ITask {
+    @Resource
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+    @Override
+    public void run(String params) {
+        log.info("EnterprisePatrolRemindTask定时任务正在执行，参数为：{}", params);
+        Result result = govOrgOpenFeignClient.sendEnterprisePatrolRemindMessage();
+        if (result.success()) {
+            log.info("EnterprisePatrolRemindTask定时任务执行成功");
+        } else {
+            log.error("EnterprisePatrolRemindTask定时任务执行失败:" + result.getMsg());
+        }
+    }
+}

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java

@@ -57,4 +57,11 @@ public interface SmsTemplateConstant {
      * ${name}给您指派了一个新的需求，请服务完成后尽快反馈，谢谢合作。
      */
     String DEMAND_SERVICE_TEM="SMS_247645013";
+
+    /**
+     * 模板名称:   数字社区-企事业单位复巡查消息提醒模板
+     * 模板CODE:  SMS_251056077
+     * 模板内容:   ${name}最近一次巡查结果不合格，请在${date}再次巡查。
+     */
+    String ENTERPRISE_PATROL_TEM="SMS_251056077";
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -712,4 +712,7 @@ public interface GovOrgOpenFeignClient {
 
     @PostMapping("/gov/org/department/notsyncdept")
     Result<CheckStaffInfoResultDTO> notSyncDept(@RequestBody CheckStaffInfoFormDTO formDTO);
+
+    @PostMapping("/gov/org/enterprise/sendEnterprisePatrolRemindMessage")
+    Result sendEnterprisePatrolRemindMessage();
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -464,6 +464,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "notSyncDept", formDTO);
     }
 
+    @Override
+    public Result sendEnterprisePatrolRemindMessage() {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "sendEnterprisePatrolRemindMessage", null);
+    }
+
     @Override
     public Result<List<CustomerGridStaffListResultDTO>> gridStaff(CustomerGridStaffListFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto);

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

@@ -301,4 +301,18 @@ public class IcEnterpriseController implements ResultDataResolver {
         icEnterpriseService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId());
         return new Result();
     }
+
+    /**
+     * 复查消息提醒
+     *
+     * @Param
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/9/6 17:31
+     */
+    @PostMapping("sendEnterprisePatrolRemindMessage")
+    public Result sendEnterprisePatrolRemindMessage() {
+        icEnterpriseService.sendEnterprisePatrolRemindMessage();
+        return new Result();
+    }
 }

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

@@ -68,4 +68,14 @@ public interface IcEnterpriseService extends BaseService<IcEnterpriseEntity> {
     PageData<EnterpriseDetailDTO> list(EnterprisePageFormDTO formDTO);
 
     void execAsyncExcelImport(Path fileSavePath, String taskId, String customerId, String userId);
+
+    /**
+     * 复查消息提醒
+     *
+     * @Param
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/9/6 17:30
+     */
+    void sendEnterprisePatrolRemindMessage();
 }

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

@@ -19,15 +19,14 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.FileUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.*;
 import com.epmet.dto.SysDictDataDTO;
-import com.epmet.dto.form.EnterpriseFormDTO;
-import com.epmet.dto.form.EnterprisePageFormDTO;
-import com.epmet.dto.form.EnterprisePatrolFormDTO;
-import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcEnterpriseEntity;
 import com.epmet.entity.IcEnterprisePatrolAttachmentEntity;
@@ -36,6 +35,7 @@ import com.epmet.excel.EnterpriseImportExcelDTO;
 import com.epmet.excel.handler.IcEnterpriseExcelImportListener;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.CoverageService;
 import com.epmet.service.IcEnterpriseService;
@@ -55,14 +55,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -90,6 +88,8 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
     private CoverageService coverageService;
     @Autowired
     private CustomerGridDao customerGridDao;
+    @Resource
+    private EpmetMessageOpenFeignClient messageOpenFeignClient;
 
     /**
      * 企事业单位巡查】新增/编辑
@@ -400,6 +400,34 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
 
     }
 
+    @Override
+    public void sendEnterprisePatrolRemindMessage() {
+        //一天后
+        Date afterThreeDayDate=DateUtils.calDateBaseDay(new Date(), NumConstant.ONE);
+        String dateId= DateUtils.format(afterThreeDayDate, DateUtils.DATE_PATTERN_YYYYMMDD);
+        LambdaQueryWrapper<IcEnterprisePatrolRecordEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.apply("DATE_FORMAT(REVIEW_TIME,'%Y%m%d') = " + dateId);
+        List<IcEnterprisePatrolRecordEntity> list = enterprisePatrolRecordDao.selectList(wrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<SendSmsFormDTO> smsList=new ArrayList<>();
+            list.forEach(item -> {
+                IcEnterpriseEntity enterprise = baseDao.selectById(item.getEnterpriseId());
+                if (null != enterprise) {
+                    SendSmsFormDTO sms = new SendSmsFormDTO();
+                    sms.setCustomerId(item.getCustomerId());
+                    sms.setMobile(item.getMobile());
+                    sms.setAliyunTemplateCode(SmsTemplateConstant.ENTERPRISE_PATROL_TEM);
+                    Map<String, String> paramMap = new HashMap<>();
+                    paramMap.put("name",enterprise.getPlaceOrgName());
+                    paramMap.put("date",DateUtils.format(item.getReviewTime(),DateUtils.DATE_PATTERN));
+                    sms.setParamMap(paramMap);
+                    smsList.add(sms);
+                }
+            });
+            messageOpenFeignClient.sendMsg(smsList);
+        }
+    }
+
     private CustomerStaffInfoCacheResult queryCurrentStaff(String customerId, String userId) {
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
         if (null == staffInfo) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java

@@ -79,6 +79,12 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
         if (null == result.getData() || result.getData().size() < NumConstant.ONE) {
             return;
         }
+        // 根据编码长度判断 grid_level
+        // 14位 =》06 社区、村
+        // 9位= 》04 乡镇
+        // 6位 -》03 县
+        // 19位 =>07网格
+
         // 2.封装数据
         List<GridInfoPingyinEntity> gridInfoList = new ArrayList<>();
         result.getData().forEach(ag -> {
@@ -176,6 +182,12 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
             return;
         }
 
+        // 根据编码长度判断 grid_level
+        // 14位 =》06 社区、村
+        // 9位= 》04 乡镇
+        // 6位 -》03 县
+        // 19位 =>07网格
+
         // 2.封装数据
         List<GridInfoPingyinEntity> gridInfoList = new ArrayList<>();
         result.getData().forEach(ag -> {

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java

@@ -43,6 +43,8 @@ public class ResiGroupMemberDTO implements Serializable {
      * 用户id，来源于customer_user.id
      */
 	private String customerUserId;
+	private String customerUserName;
+	private String customerUserMobile;
 
     /**
      * 小组id: 来源于resi_group表id

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

@@ -346,4 +346,6 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 * @date 2021.09.08 14:00:52
 	 */
 	List<GroupDetailResultDTO> listGroupsByMember(@Param("memberUserId") String memberUserId, @Param("gridId") String gridId);
+
+	List<ResiGroupMemberDTO> getMembersByGroup(@Param("ids")List<String> ids);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -44,6 +44,7 @@ import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
@@ -1946,6 +1947,16 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if (CollectionUtils.isEmpty(entityList)) {
 			return Collections.emptyMap();
 		}
+		List<String> groupIds = entityList.stream().map(m -> m.getId()).collect(Collectors.toList());
+		List<ResiGroupMemberDTO> membersByGroup = baseDao.getMembersByGroup(groupIds);
+		Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(membersByGroup.stream().map(m -> m.getCustomerUserId()).collect(Collectors.toList()));
+		if (!listResult.success()){
+			throw new EpmetException("查询居民信息失败...");
+		}
+		membersByGroup.stream().forEach(m -> listResult.getData().stream().filter(u -> u.getUserId().equals(m.getCustomerUserId())).forEach(u -> {
+			m.setCustomerUserMobile(u.getMobile());
+			m.setCustomerUserName(u.getRealName());
+		}));
 		List<IcPartyOrgTreeDTO> list = entityList.stream().filter(i -> StringUtils.isNotBlank(i.getPartyOrgId())).map(item -> {
 			IcPartyOrgTreeDTO dto = new IcPartyOrgTreeDTO();
 			dto.setId(item.getId());
@@ -1955,6 +1966,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			dto.setPartyOrgName(item.getGroupName());
 			return dto;
 		}).collect(Collectors.toList());
+		list.stream().forEach(l -> membersByGroup.stream().filter(m -> m.getResiGroupId().equals(l.getId())).forEach(m -> {
+			l.setPrincipal(m.getCustomerUserName());
+			l.setPrincipalMobile(m.getCustomerUserMobile());
+		}));
 		if (CollectionUtils.isEmpty(list)) {
 			return Collections.emptyMap();
 		}

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -1072,4 +1072,15 @@
             and resi_group.STATE = 'approved'
         order by resi_group.CREATED_TIME desc
     </select>
+    <select id="getMembersByGroup" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
+        SELECT CUSTOMER_USER_ID,RESI_GROUP_ID FROM resi_group_member
+        WHERE DEL_FLAG = '0'
+          AND GROUP_LEADER_FLAG = 'leader'
+
+          AND RESI_GROUP_ID IN (
+              <foreach collection="ids" item="id" separator=",">
+                  #{id}
+              </foreach>
+            )
+    </select>
 </mapper>

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java

@@ -84,6 +84,16 @@ public class IcPartyOrgDTO implements Serializable {
      */
 	private String address;
 
+    /**
+     * 负责人
+     */
+	private String principal;
+
+    /**
+     * 联系电话
+     */
+	private String principalMobile;
+
     /**
      * 党组织介绍
      */

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.resi.partymember.dto.partyOrg.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/9/7 15:02
+ * @DESC
+ */
+@Data
+public class EditPrincipalFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1006713792388125512L;
+
+    /**
+     * 负责人
+     */
+    @NotBlank(message = "principal不能为空",groups = AddGroup.class)
+    private String principal;
+
+    @NotBlank(message = "partyOrgId不能为空",groups = AddGroup.class)
+    private String partyOrgId;
+
+    /**
+     * 联系电话
+     */
+    @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class)
+    private String principalMobile;
+}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java

@@ -53,6 +53,16 @@ public class IcPartyOrgTreeDTO implements Serializable {
      */
 	private String partyOrgName;
 
+    /**
+     * 负责人
+     */
+    private String principal;
+
+    /**
+     * 联系电话
+     */
+    private String principalMobile;
+
     private List<IcPartyOrgTreeDTO> children = new ArrayList<>();
 
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java

@@ -14,6 +14,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.partyOrg.excel.IcPartyOrgExcel;
 import com.epmet.modules.partyOrg.service.IcPartyOrgService;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO;
@@ -189,4 +190,17 @@ public class IcPartyOrgController {
         return new Result<List<PartyOrgListResultDTO>>().ok(icPartyOrgService.partOrgList(formDTO.getGridId()));
     }
 
+    /**
+     * Desc: 党组织修改负责人
+     * @param formDTO
+     * @author zxc
+     * @date 2022/9/7 15:04
+     */
+    @PostMapping("editPrincipal")
+    public Result editPrincipal(@RequestBody EditPrincipalFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        icPartyOrgService.editPrincipal(formDTO);
+        return new Result();
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java

@@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO;
@@ -117,4 +118,12 @@ public interface IcPartyOrgDao extends BaseDao<IcPartyOrgEntity> {
     List<IcPartyOrgDTO> getSelfAndSub(@Param("joinOrgId") String joinOrgId);
 
     List<PartyOrgListResultDTO> partOrgList(@Param("agencyId") String agencyId);
+
+    /**
+     * Desc: 党组织修改负责人
+     * @param formDTO
+     * @author zxc
+     * @date 2022/9/7 15:04
+     */
+    void editPrincipal(EditPrincipalFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java

@@ -73,6 +73,16 @@ public class IcPartyOrgEntity extends BaseEpmetEntity {
      */
 	private String address;
 
+	/**
+	 * 负责人
+	 */
+	private String principal;
+
+	/**
+	 * 联系电话
+	 */
+	private String principalMobile;
+
     /**
      * 党组织介绍
      */

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.*;
@@ -148,4 +149,13 @@ public interface IcPartyOrgService extends BaseService<IcPartyOrgEntity> {
     void adjustOrgPath(List<String> customerIds);
 
     List<PartyOrgListResultDTO> partOrgList(String gridId);
+
+    /**
+     * Desc: 党组织修改负责人
+     * @param formDTO
+     * @author zxc
+     * @date 2022/9/7 15:04
+     */
+    void editPrincipal(EditPrincipalFormDTO formDTO);
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java

@@ -29,6 +29,7 @@ import com.epmet.modules.partymember.dao.IcPartyMemberDao;
 import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.*;
@@ -490,4 +491,16 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
         return baseDao.partOrgList(gridInfo.getPid());
     }
 
+    /**
+     * Desc: 党组织修改负责人
+     * @param formDTO
+     * @author zxc
+     * @date 2022/9/7 15:04
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void editPrincipal(EditPrincipalFormDTO formDTO) {
+        baseDao.editPrincipal(formDTO);
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal.sql

@@ -0,0 +1,2 @@
+ALTER TABLE ic_party_org ADD COLUMN PRINCIPAL VARCHAR(30) not null DEFAULT '' COMMENT '负责人' AFTER ADDRESS;
+ALTER TABLE ic_party_org ADD COLUMN PRINCIPAL_MOBILE VARCHAR(30) not null DEFAULT '' COMMENT '联系方式' AFTER PRINCIPAL;

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml

@@ -24,6 +24,16 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+
+    <!-- 党组织修改负责人 -->
+    <update id="editPrincipal">
+        update ic_party_org
+        set PRINCIPAL_MOBILE = #{principalMobile},
+            PRINCIPAL = #{principal},
+            UPDATED_TIME = NOW()
+        where id = #{partyOrgId}
+    </update>
+
     <select id="getTreelist" resultType="com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO">
         select  ID,
 				CUSTOMER_ID,
@@ -32,7 +42,9 @@
 				AGENCY_ID,
 				AGENCY_PIDS,
 				PARTY_ORG_TYPE,
-				PARTY_ORG_NAME
+				PARTY_ORG_NAME,
+                PRINCIPAL_MOBILE,
+                PRINCIPAL
         from ic_party_org
         where DEL_FLAG=0
               and CUSTOMER_ID=#{customerId}
@@ -87,7 +99,9 @@
                 AGENCY_ID,
                 AGENCY_PIDS,
                 PARTY_ORG_TYPE,
-                PARTY_ORG_NAME as label
+                PARTY_ORG_NAME as label,
+                PRINCIPAL_MOBILE,
+                PRINCIPAL
         from ic_party_org
         where DEL_FLAG=0
             and CUSTOMER_ID=#{customerId}
@@ -105,7 +119,9 @@
                 AGENCY_ID,
                 AGENCY_PIDS,
                 PARTY_ORG_TYPE,
-                PARTY_ORG_NAME
+                PARTY_ORG_NAME,
+                PRINCIPAL_MOBILE,
+                PRINCIPAL
         from ic_party_org
         where DEL_FLAG=0
                 and CUSTOMER_ID=#{customerId}
@@ -124,7 +140,9 @@
                 AGENCY_ID,
                 AGENCY_PIDS,
                 PARTY_ORG_TYPE,
-                PARTY_ORG_NAME
+                PARTY_ORG_NAME,
+                PRINCIPAL_MOBILE,
+                PRINCIPAL
         from ic_party_org
         where DEL_FLAG = 0
                 and CUSTOMER_ID=#{customerId}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java

@@ -66,6 +66,11 @@ public class IcPointNucleicMonitoringDTO implements Serializable {
      */
 	private String address;
 
+    /**
+     * 未禁用enable,已禁用disabled
+     */
+    private String enableFlag;
+
     /**
      * 经度
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java

@@ -77,6 +77,11 @@ public class MapInfoResultDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 未禁用enable,已禁用disabled
+     */
+    private String enableFlag;
+
 
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java

@@ -43,7 +43,17 @@ public class IcPointAppController {
         return icPointAppService.getMapInfoByPointType(formDTO);
     }
 
-
+    /**
+     * Desc: 核酸监测点启用禁用
+     * @param id
+     * @author zxc
+     * @date 2022/9/6 16:39
+     */
+    @PostMapping("enableOrDisabled/{id}")
+    public Result enableOrDisabled(@PathVariable("id") String id){
+        icPointAppService.enableOrDisabled(id);
+        return new Result();
+    }
 
 
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java

@@ -49,4 +49,12 @@ public interface IcPointNucleicMonitoringDao extends BaseDao<IcPointNucleicMonit
      */
     List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO);
 
+    /**
+     * Desc: 核酸监测点启用禁用
+     * @param id
+     * @author zxc
+     * @date 2022/9/6 16:39
+     */
+    void enableOrDisabled(@Param("id") String id);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java

@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 核酸监测点
  *
@@ -66,6 +63,11 @@ public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity {
      */
 	private String address;
 
+	/**
+	 * 未禁用enable,已禁用disabled
+	 */
+	private String enableFlag;
+
     /**
      * 经度
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java

@@ -1,18 +1,10 @@
 package com.epmet.service;
 
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.IcPointNucleicMonitoringDTO;
 import com.epmet.dto.form.MapInfoFormDTO;
 import com.epmet.dto.result.MapInfoResultDTO;
-import com.epmet.entity.IcPointNucleicMonitoringEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import java.io.InputStream;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 地图信息
@@ -29,5 +21,11 @@ public interface IcPointAppService {
      */
     Result<List<MapInfoResultDTO>> getMapInfoByPointType(MapInfoFormDTO formDTO);
 
-
+    /**
+     * Desc: 核酸监测点启用禁用
+     * @param id
+     * @author zxc
+     * @date 2022/9/6 16:39
+     */
+    void enableOrDisabled(String id);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java

@@ -105,4 +105,12 @@ public interface IcPointNucleicMonitoringService extends BaseService<IcPointNucl
      * @date 2022-06-20
      */
     List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO);
+
+    /**
+     * Desc: 核酸监测点启用禁用
+     * @param id
+     * @author zxc
+     * @date 2022/9/6 16:39
+     */
+    void enableOrDisabled(String id);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java

@@ -1,58 +1,17 @@
 package com.epmet.service.impl;
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.exception.EpmetException;
-import com.epmet.commons.tools.exception.ExceptionUtils;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
-import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
-import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
-import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constants.ImportTaskConstants;
-import com.epmet.dao.IcPointVaccinesInoculationDao;
-import com.epmet.dto.IcPointVaccinesInoculationDTO;
-import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.MapInfoFormDTO;
 import com.epmet.dto.result.MapInfoResultDTO;
-import com.epmet.dto.result.UploadImgResultDTO;
-import com.epmet.entity.IcPointVaccinesInoculationEntity;
-import com.epmet.excel.IcPointVaccinesInoculationImportExcel;
-import com.epmet.excel.error.PointVaccinesInoculationErrorModel;
-import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
-import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.OssFeignClient;
-import com.epmet.redis.IcPointVaccinesInoculationRedis;
 import com.epmet.service.IcPointAppService;
 import com.epmet.service.IcPointNucleicMonitoringService;
 import com.epmet.service.IcPointVaccinesInoculationService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.entity.ContentType;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 地图信息
@@ -85,4 +44,15 @@ public class IcPointAppServiceImpl implements IcPointAppService {
         }
         return new Result<List<MapInfoResultDTO>>().ok(mapInfoResultDTO);
     }
+
+    /**
+     * Desc: 核酸监测点启用禁用
+     * @param id
+     * @author zxc
+     * @date 2022/9/6 16:39
+     */
+    @Override
+    public void enableOrDisabled(String id) {
+        icPointNucleicMonitoringService.enableOrDisabled(id);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java

@@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -16,7 +16,6 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constants.ImportTaskConstants;
@@ -28,10 +27,8 @@ import com.epmet.dto.form.OrgInfoPointFormDTO;
 import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.MapInfoResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
-import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
 import com.epmet.entity.IcPointNucleicMonitoringEntity;
 import com.epmet.excel.IcPointNucleicMonitoringImportExcel;
-import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel;
 import com.epmet.excel.error.PointNucleicMonitoringErrorModel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
@@ -373,5 +370,17 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPoint
         return list;
     }
 
+    /**
+     * Desc: 核酸监测点启用禁用
+     * @param id
+     * @author zxc
+     * @date 2022/9/6 16:39
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void enableOrDisabled(String id) {
+        baseDao.enableOrDisabled(id);
+    }
+
 
 }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.68__alter_ic_point_nucleic_monitoring_enable.sql

@@ -0,0 +1 @@
+ALTER TABLE ic_point_nucleic_monitoring ADD COLUMN ENABLE_FLAG VARCHAR(10) not null DEFAULT 'enable' COMMENT '未禁用enable,已禁用disabled' AFTER ADDRESS;

epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml

@@ -24,6 +24,14 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 核酸监测点启用禁用 -->
+    <update id="enableOrDisabled">
+        update ic_point_nucleic_monitoring
+        set UPDATED_TIME = now(),
+            ENABLE_FLAG = case when ENABLE_FLAG = 'enable' then 'disabled' else 'enable' end
+        where id = #{id}
+    </update>
+
     <select id="getAllAddressName" resultType="java.lang.String">
         select
         NAME
@@ -53,6 +61,7 @@
         SERVE_TIME,
         MOBILE,
         ADDRESS,
+        ENABLE_FLAG,
         LONGITUDE,
         LATITUDE,
         DEL_FLAG,
@@ -121,6 +130,7 @@
         when round((st_distance_sphere(point(#{longitude},#{latitude}), point(LONGITUDE, LATITUDE))) / 1000 ,1) &lt;= 5 then '5'
         else '99' end ) as kmNum,
         SERVE_TIME as date,
+        ENABLE_FLAG,
         MOBILE,
         ADDRESS,
         LONGITUDE,
@@ -128,6 +138,7 @@
         from ic_point_nucleic_monitoring
         where DEL_FLAG = 0
         and CUSTOMER_ID = #{customerId}
+        and ENABLE_FLAG = 'enable'
         <if test="name != null and name != ''">
             and NAME like CONCAT('%' ,#{name}, '%')
         </if>