Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop-rcd

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/WebsiteRangeDTO.java

+package com.mmc.iuav.user.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author LW
+ * @date 2022/4/22 10:02
+ * 概要：
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WebsiteRangeDTO implements Serializable {
+    private String address;
+    private String name;
+    private Double lon;
+    private Double lat;
+    private Double distance;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/ApplyQO.java

@@ -11,7 +11,6 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @Author LW
- *
  * @date 2023/6/27 14:59 概要：
  */
 @Data
@@ -24,6 +23,9 @@ public class ApplyQO {
     @ApiModelProperty(value = "申请状态", example = "0")
     private Integer applyStatus;
 
+    @ApiModelProperty(value = "认证公司名称", example = "科比特")
+    private String companyName;
+
     @ApiModelProperty(value = "开始时间", example = "2023-01-01 00:00:00")
     private String startTime;
 

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/ApplyTagEditVO.java

+package com.mmc.iuav.user.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author LW
+ * @date 2023/7/15 10:10
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ApplyTagEditVO implements Serializable {
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "网点id")
+    private Integer websiteId;
+    @ApiModelProperty(value = "标签id")
+    private Integer cooperationTagId;
+    @ApiModelProperty(value = "网点名称")
+    private String name;
+    @ApiModelProperty(value = "服务资质")
+    private String content;
+    @ApiModelProperty(value = "服务评价分数")
+    private Integer score;
+    @ApiModelProperty(value = "地址信息")
+    private String address;
+    @ApiModelProperty(value = "纬度")
+    private Double lat;
+    @ApiModelProperty(value = "经度")
+    private Double lon;
+}

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserApplyTagVO.java

@@ -59,6 +59,15 @@ public class UserApplyTagVO implements Serializable {
     @ApiModelProperty(value = "加盟类型名称")
     private String cooperationTagName;
 
+    @ApiModelProperty(value = "认证企业名称")
+    private String companyName;
+
     @ApiModelProperty(value = "审批状态 0:申请中 1：通过  2：驳回")
     private Integer approvalStatus;
+
+    @ApiModelProperty(value = "服务资质内容")
+    private String content;
+
+    @ApiModelProperty(value = "服务评价⭐⭐⭐⭐⭐")
+    private Integer score;
 }

cms-common/cms-common-util/src/main/java/com/mmc/iuav/response/ResultEnum.java

@@ -44,7 +44,9 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     UPDATE_OWNER_ROLE_MENUS_ERROR("8007", "禁止修改与当前登录账号角色相同的角色权限"),
     UPDATE_OWNER_ROLE_ERROR("8008", "禁止修改当前账号的角色"),
     UPDATE_ADMIN_ROLE_ERROR("8009", "禁止修改admin账号的角色"),
-    ONLY_ONE_ADMIN_ERROR("8010", "禁止该账号获取超级管理员角色");
+    ONLY_ONE_ADMIN_ERROR("8010", "禁止该账号获取超级管理员角色"),
+    DELETE_ADMIN_ERROR("8011", "禁止删除超级管理员角色账号"),
+    DELETE_YOURSELF_ERROR("8011", "禁止删除自己的账号");
 
     /**
      * 错误码

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BackUserAccountController.java

@@ -47,7 +47,7 @@ public class BackUserAccountController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("removeBAccount")
     public ResultBody disableBAccount(@RequestParam Integer userAccountId, HttpServletRequest request) {
-        return backUserAccountService.disableBAccount(userAccountId);
+        return backUserAccountService.disableBAccount(userAccountId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
     @ApiOperation(value = "账号-列表")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CooperationController.java

@@ -4,15 +4,9 @@ import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.qo.ApplyQO;
-import com.mmc.iuav.user.model.vo.CooperationTagVO;
-import com.mmc.iuav.user.model.vo.UserApplyTagDetailsVO;
-import com.mmc.iuav.user.model.vo.UserApplyTagVO;
-import com.mmc.iuav.user.model.vo.UserCooperationTagVO;
+import com.mmc.iuav.user.model.vo.*;
 import com.mmc.iuav.user.service.CooperationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +21,8 @@ import java.util.List;
 @RequestMapping("/cooperation/")
 @RestController
 public class CooperationController extends BaseController {
-  @Autowired private CooperationService cooperationService;
+    @Autowired
+    private CooperationService cooperationService;
 
     @ApiOperation(value = "加盟标签列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CooperationTagVO.class)})
@@ -61,6 +56,31 @@ public class CooperationController extends BaseController {
         return ResultBody.success(cooperationService.listUserApplyTag(applyQO));
     }
 
+    @ApiOperation(value = "后台-编辑服务商信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("editUserApplyTag")
+    public ResultBody editUserApplyTag(@RequestBody ApplyTagEditVO applyTagEditVO) {
+        return cooperationService.editUserApplyTag(applyTagEditVO);
+    }
+
+    @ApiOperation(value = "后台-编辑详情信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ApplyTagEditVO.class)})
+    @GetMapping("editUserApplyTagDetails")
+    public ResultBody editUserApplyTagDetails(@RequestParam Integer id) {
+        return cooperationService.editUserApplyTagDetails(id);
+    }
+
+    @ApiOperation(value = "服务商网点数据")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("service/bitmap")
+    public ResultBody listServiceBitmapData(@ApiParam(value = "类型  注：按照渠道标签的id传入即可") @RequestParam Integer type,
+                                            @RequestParam Integer pageNo,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Double lon,
+                                            @RequestParam Double lat) {
+        return ResultBody.success(cooperationService.listServiceBitmapData(type, pageNo, pageSize, lon, lat));
+    }
+
     @ApiOperation(value = "强制删除")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("deleteApplyTag")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/RoleController.java

@@ -69,7 +69,6 @@ public class RoleController extends BaseController {
         return roleService.listRoleMenuInfo(roleId);
     }
 
-    
     @ApiOperation(value = "修改角色菜单权限")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("updateRoleMenuInfo")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/CooperationDao.java

 package com.mmc.iuav.user.dao;
 
-import com.mmc.iuav.user.entity.CooperationTagDO;
-import com.mmc.iuav.user.entity.TagApplyResourceDO;
-import com.mmc.iuav.user.entity.UserApplyTagDO;
-import com.mmc.iuav.user.entity.UserTagDO;
+import com.mmc.iuav.user.entity.*;
 import com.mmc.iuav.user.model.qo.ApplyQO;
+import com.mmc.iuav.user.model.vo.ApplyTagEditVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -47,6 +45,7 @@ public interface CooperationDao {
 
     /**
      * 根据用户id查询合作标签信息
+     *
      * @param userAccountId
      * @return
      */
@@ -95,12 +94,14 @@ public interface CooperationDao {
 
     /**
      * 删除用户原来的标签
+     *
      * @param userAccountId
      */
     void removeUserTag(Integer userAccountId);
 
     /**
      * 添加用户合作加盟标签
+     *
      * @param userAccountId
      * @param cooperationTagIds
      */
@@ -108,8 +109,19 @@ public interface CooperationDao {
 
     /**
      * 根据用户id查询用户拥有的合作标签
+     *
      * @param uIds
      * @return
      */
     List<CooperationTagDO> listUserCooperationTagByUIds(@Param("uIds") List<Integer> uIds);
+
+    void addWebsiteInfo(ApplyTagEditVO applyTagEditVO);
+
+    int countServiceBitmapData(Integer type);
+
+    List<WebsiteInfoDO> listServiceBitmapData(Integer type, Double lon, Double lat, int pageNo, Integer pageSize);
+
+    void updateWebsiteInfo(ApplyTagEditVO applyTagEditVO);
+
+    WebsiteInfoDO getWebsiteInfoByUserApplyId(Integer id);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserApplyTagDO.java

 package com.mmc.iuav.user.entity;
 
+import com.mmc.iuav.user.model.vo.ApplyTagEditVO;
 import com.mmc.iuav.user.model.vo.UserApplyTagVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -24,10 +25,22 @@ public class UserApplyTagDO implements Serializable {
     private String remark;
     private Date createTime;
     private Integer applyStatus;
+    private String content;
+    private Integer score;
 
-  /** 辅助字段start */
+    /**
+     * 辅助字段start
+     */
     private String tagName;
-  /** 辅助字段end */
+    private String companyName;
+    private String address;
+    private String name;
+    private Double lat;
+    private Double lon;
+
+    /**
+     * 辅助字段end
+     */
     public UserApplyTagVO buildUserApplyTagVO() {
         return UserApplyTagVO.builder()
                 .id(id)
@@ -39,6 +52,9 @@ public class UserApplyTagDO implements Serializable {
                 .applyTime(createTime)
                 .approvalStatus(applyStatus)
                 .cooperationTagName(tagName)
+                .companyName(companyName)
+                .content(content)
+                .score(score)
                 .build();
     }
 
@@ -49,4 +65,12 @@ public class UserApplyTagDO implements Serializable {
         this.applyPhone = userApplyTagVO.getApplyPhone();
         this.remark = userApplyTagVO.getRemark();
     }
+
+    public ApplyTagEditVO buildApplyTagEditVO() {
+        return ApplyTagEditVO.builder().id(id)
+                .cooperationTagId(cooperationTagId).name(name)
+                .address(address).lat(lat).lon(lon)
+                .content(content).score(score)
+                .build();
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/WebsiteInfoDO.java

+package com.mmc.iuav.user.entity;
+
+import com.mmc.iuav.user.model.dto.WebsiteRangeDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author LW
+ * @date 2022/4/21 20:09 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WebsiteInfoDO implements Serializable {
+    private Integer id;
+    private String name;
+    private String address;
+    private Double lat;
+    private Double lon;
+    private Double distance;
+    private Integer type;
+    private Integer userApplyTag;
+
+
+    public WebsiteRangeDTO buildWebsiteRangeDTO() {
+        this.distance = this.distance == null ? 0 : (BigDecimal.valueOf(this.distance).setScale(2, BigDecimal.ROUND_HALF_DOWN)).doubleValue();
+        return WebsiteRangeDTO.builder()
+                .name(name)
+                .address(address)
+                .lon(this.lon)
+                .lat(this.lat)
+                .distance(this.distance / 1000)
+                .build();
+    }
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/BackUserAccountService.java

@@ -34,10 +34,11 @@ public interface BackUserAccountService {
     /**
      * 禁用后台用户
      *
-     * @param userAccountId
+     * @param accountId
+     * @param backUserAccountId
      * @return
      */
-    ResultBody disableBAccount(Integer userAccountId);
+    ResultBody disableBAccount(Integer accountId, Integer backUserAccountId);
 
     /**
      * 后台用户列表

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CooperationService.java

@@ -3,12 +3,12 @@ package com.mmc.iuav.user.service;
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.qo.ApplyQO;
+import com.mmc.iuav.user.model.vo.ApplyTagEditVO;
 import com.mmc.iuav.user.model.vo.CooperationTagVO;
 import com.mmc.iuav.user.model.vo.UserApplyTagVO;
 import com.mmc.iuav.user.model.vo.UserCooperationTagVO;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author: zj @Date: 2023/5/17 21:19
@@ -31,6 +31,7 @@ public interface CooperationService {
 
     /**
      * 后台用户设置小程序用户等级标签
+     *
      * @param userCooperationTagVO
      * @return
      */
@@ -51,4 +52,10 @@ public interface CooperationService {
     ResultBody applyTagDetails(Integer id, Integer userAccountId);
 
     ResultBody approvalApplyTag(Integer id, Boolean status);
+
+    ResultBody editUserApplyTag(ApplyTagEditVO applyTagEditVO);
+
+    ResultBody editUserApplyTagDetails(Integer id);
+
+    PageResult listServiceBitmapData(Integer type, Integer pageNo, Integer pageSize, Double lon, Double lat);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -47,24 +47,25 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
     public ResultBody insertBAccount(BUserAccountVO bUserAccountVO) {
         if (!bUserAccountVO.getPassWord().equals(bUserAccountVO.getAlertPwd())) {
             // 两次密码不一致
-            throw new BizException(ResultEnum.PWD_ALERT_ERROR);
+            return ResultBody.error(ResultEnum.PWD_ALERT_ERROR);
         }
         // 获取新增的账户名是否已经存在
         int count = backUserAccountDao.countUserAccountNo(null, bUserAccountVO.getAccountNo());
         if (count > 0) {
-            throw new BizException(ResultEnum.ADD_USER_ACCOUNT_NAME_EXISTS);
+            return ResultBody.error(ResultEnum.ADD_USER_ACCOUNT_NAME_EXISTS);
         }
         if (bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) {
-            throw new BizException(ResultEnum.ONLY_ONE_ADMIN_ERROR);
+            return ResultBody.error(ResultEnum.ONLY_ONE_ADMIN_ERROR);
         }
-        roleDao.insertUserRoleRel(bUserAccountVO.getId(), bUserAccountVO.getRoleId());
         BackUserAccountDO backUserAccountDO = new BackUserAccountDO(bUserAccountVO);
         try {
             backUserAccountDO.setPassword(PwdUtil.securityPwd(bUserAccountVO.getPassWord()));
         } catch (NoSuchAlgorithmException e) {
-            throw new BizException(ResultEnum.PWD_CREATE_ERROR);
+            return ResultBody.error(ResultEnum.PWD_CREATE_ERROR);
         }
         backUserAccountDao.insertBackUserAccount(backUserAccountDO);
+        // 添加角色
+        roleDao.insertUserRoleRel(backUserAccountDO.getId(), bUserAccountVO.getRoleId());
         // 添加单位信息
         if (bUserAccountVO.getCompanyId() != null) {
             CompanyBackUserDO companyBackUserDO = new CompanyBackUserDO();
@@ -86,35 +87,43 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
                 throw new BizException(ResultEnum.UPDATE_USER_ACCOUNT_REPEAT);
             }
         }
-        BackUserAccountDO userAccountDO = new BackUserAccountDO(bUserAccountVO);
-        backUserAccountDao.updateBackUserAccount(userAccountDO);
-        // 修改单位信息
-        if (bUserAccountVO.getCompanyId() != null) {
-            CompanyBackUserDO companyBackUserDO = new CompanyBackUserDO();
-            companyBackUserDO.setBackUserAccountId(userAccountDO.getId());
-            companyBackUserDO.setCompanyInfoId(bUserAccountVO.getCompanyId());
-            companyService.updateCompanyBackUser(companyBackUserDO);
-        }
         // 当前角色不是超级管理员，则不能修改为管理员账号
         RoleInfoDO roleInfoDO = roleDao.getRoleInfoByUserId(bUserAccountVO.getId());
         if (!roleInfoDO.getId().equals(RoleEnums.ADMIN.getId()) && bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) {
-            throw new BizException(ResultEnum.ONLY_ONE_ADMIN_ERROR);
+            return ResultBody.error(ResultEnum.ONLY_ONE_ADMIN_ERROR);
         }
         // 不能修改自己的角色
-        if (loginSuccessDTO.getUserAccountId().toString().equals(bUserAccountVO.getId().toString())) {
-            throw new BizException(ResultEnum.UPDATE_OWNER_ROLE_ERROR);
+        if (loginSuccessDTO.getUserAccountId().toString().equals(bUserAccountVO.getId().toString())
+                && !bUserAccountVO.getRoleId().toString().equals(roleInfoDO.getId())) {
+            return ResultBody.error(ResultEnum.UPDATE_OWNER_ROLE_ERROR);
         }
         // 不能修改admin账号的角色
         if (bUserAccountVO.getId().equals(1) && !bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) {
-            throw new BizException(ResultEnum.UPDATE_ADMIN_ROLE_ERROR);
+            return ResultBody.error(ResultEnum.UPDATE_ADMIN_ROLE_ERROR);
+        }
+        BackUserAccountDO userAccountDO = new BackUserAccountDO(bUserAccountVO);
+        backUserAccountDao.updateBackUserAccount(userAccountDO);
+        // 修改单位信息
+        if (bUserAccountVO.getCompanyId() != null) {
+            CompanyBackUserDO companyBackUserDO = new CompanyBackUserDO();
+            companyBackUserDO.setBackUserAccountId(userAccountDO.getId());
+            companyBackUserDO.setCompanyInfoId(bUserAccountVO.getCompanyId());
+            companyService.updateCompanyBackUser(companyBackUserDO);
         }
         roleDao.updateUserRoleRel(bUserAccountVO.getId(), bUserAccountVO.getRoleId());
         return ResultBody.success();
     }
 
     @Override
-    public ResultBody disableBAccount(Integer userAccountId) {
-        backUserAccountDao.disableBackUserAccountDO(userAccountId);
+    public ResultBody disableBAccount(Integer accountId, Integer backUserAccountId) {
+        RoleInfoDO roleInfoDO = roleDao.getRoleInfoByUserId(accountId);
+        if (roleInfoDO.getSuperAdmin().equals(RoleEnums.ADMIN.getId())) {
+            return ResultBody.error(ResultEnum.DELETE_ADMIN_ERROR);
+        }
+        if (accountId.toString().equals(backUserAccountId.toString())) {
+            return ResultBody.error(ResultEnum.DELETE_YOURSELF_ERROR);
+        }
+        backUserAccountDao.disableBackUserAccountDO(accountId);
         return ResultBody.success();
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -7,12 +7,9 @@ import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.dao.CompanyAuthDao;
 import com.mmc.iuav.user.dao.CooperationDao;
 import com.mmc.iuav.user.entity.*;
+import com.mmc.iuav.user.model.dto.WebsiteRangeDTO;
 import com.mmc.iuav.user.model.qo.ApplyQO;
-import com.mmc.iuav.user.model.vo.AttachmentVO;
-import com.mmc.iuav.user.model.vo.CooperationTagVO;
-import com.mmc.iuav.user.model.vo.UserApplyTagDetailsVO;
-import com.mmc.iuav.user.model.vo.UserApplyTagVO;
-import com.mmc.iuav.user.model.vo.UserCooperationTagVO;
+import com.mmc.iuav.user.model.vo.*;
 import com.mmc.iuav.user.service.CooperationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,9 +23,11 @@ import java.util.stream.Collectors;
  */
 @Service
 public class CooperationServiceImpl implements CooperationService {
-  @Autowired private CooperationDao cooperationDao;
+    @Autowired
+    private CooperationDao cooperationDao;
 
-  @Autowired private CompanyAuthDao companyAuthDao;
+    @Autowired
+    private CompanyAuthDao companyAuthDao;
 
     @Override
     public List<CooperationTagVO> listTag() {
@@ -66,7 +65,7 @@ public class CooperationServiceImpl implements CooperationService {
         // 删除原来的
         cooperationDao.removeUserTag(userCooperationTagVO.getUserAccountId());
         // 添加新的
-        if (!CollectionUtils.isEmpty(userCooperationTagVO.getCooperationTagIds())){
+        if (!CollectionUtils.isEmpty(userCooperationTagVO.getCooperationTagIds())) {
             cooperationDao.batchInsertUserTag(userCooperationTagVO.getUserAccountId(), userCooperationTagVO.getCooperationTagIds());
         }
         return ResultBody.success();
@@ -135,18 +134,61 @@ public class CooperationServiceImpl implements CooperationService {
         int count =
                 cooperationDao.userTagInfo(
                         userApplyTag.getCooperationTagId(), userApplyTag.getUserAccountId());
-    if (status){
+        if (status) {
             cooperationDao.updateApplyTagStatus(id, 1);
-      if (count == 0){
+            if (count == 0) {
                 // 审批通过往用户标签表中新增一条数据
                 UserTagDO userTagDO = new UserTagDO();
                 userTagDO.setUserAccountId(userApplyTag.getUserAccountId());
                 userTagDO.setCooperationTagId(userApplyTag.getCooperationTagId());
                 cooperationDao.insertUserTag(userTagDO);
             }
-    }else {
+        } else {
             cooperationDao.updateApplyTagStatus(id, 2);
         }
         return ResultBody.success();
     }
+
+    @Override
+    public ResultBody editUserApplyTag(ApplyTagEditVO applyTagEditVO) {
+        //判断当前服务商是否通过审核
+        UserApplyTagDO userApplyTag = cooperationDao.getUserApplyTag(applyTagEditVO.getId());
+        if (!userApplyTag.getApplyStatus().equals(1)) {
+            return ResultBody.error("当前服务商暂未通过审核！");
+        }
+        // 编辑服务商信息
+        UserApplyTagDO userApplyTagDO = new UserApplyTagDO();
+        userApplyTagDO.setId(applyTagEditVO.getId());
+        userApplyTagDO.setContent(applyTagEditVO.getContent());
+        userApplyTagDO.setScore(applyTagEditVO.getScore());
+        cooperationDao.updateUserApplyTag(userApplyTagDO);
+        // 保存网点之前判断该网点是否存在 存在则修改不存在则新增
+        WebsiteInfoDO websiteInfoDO = cooperationDao.getWebsiteInfoByUserApplyId(applyTagEditVO.getId());
+        if (websiteInfoDO == null) {
+            // 保存网点信息
+            cooperationDao.addWebsiteInfo(applyTagEditVO);
+        } else {
+            applyTagEditVO.setWebsiteId(websiteInfoDO.getId());
+            // 修改网点信息
+            cooperationDao.updateWebsiteInfo(applyTagEditVO);
+        }
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody editUserApplyTagDetails(Integer id) {
+        UserApplyTagDO userApplyTag = cooperationDao.getUserApplyTag(id);
+        return ResultBody.success(userApplyTag == null ? null : userApplyTag.buildApplyTagEditVO());
+    }
+
+    @Override
+    public PageResult listServiceBitmapData(Integer type, Integer pageNo, Integer pageSize, Double lon, Double lat) {
+        int count = cooperationDao.countServiceBitmapData(type);
+        if (count == 0) {
+            return PageResult.buildPage(pageNo, pageSize, count);
+        }
+        List<WebsiteRangeDTO> list = cooperationDao.listServiceBitmapData(type, lon, lat, (pageNo - 1) * pageSize, pageSize)
+                .stream().map(WebsiteInfoDO::buildWebsiteRangeDTO).collect(Collectors.toList());
+        return PageResult.buildPage(pageNo, pageSize, count, list);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/RoleServiceImpl.java

@@ -101,7 +101,6 @@ public class RoleServiceImpl implements RoleService {
         if (roleMenuInfoVO.getRoleId().equals(loginSuccessDTO.getRoleInfo().getId())) {
             return ResultBody.error(ResultEnum.UPDATE_OWNER_ROLE_MENUS_ERROR);
         }
-        if (!CollectionUtils.isEmpty(roleMenuInfoVO.getMenuInfoIds())) {
         List<MenuInfoDO> menuInfoDOList = roleDao.listRoleMenuInfo(roleMenuInfoVO.getRoleId());
         List<Integer> existMenuIds = menuInfoDOList.stream().map(MenuInfoDO::getId).collect(Collectors.toList());
         // 新添加的权限
@@ -114,7 +113,6 @@ public class RoleServiceImpl implements RoleService {
         if (!CollectionUtils.isEmpty(deleteMenuIds)) {
             roleDao.batchDeleteMenuIds(roleMenuInfoVO.getRoleId(), deleteMenuIds);
         }
-        }
         return ResultBody.success();
     }
 

csm-service/cms-service-user/src/main/resources/banner.txt

+
+                                  .".".".
+                                (`       `)               _.-=-.
+                                 '._.--.-;             .-`  -'  '.
+                                .-'`.o )  \           /  .-_.--'  `\
+                               `;---) \    ;         /  / ;' _-_.-' `
+                                 `;"`  ;    \        ; .  .'   _-' \
+                                  (    )    |        |  / .-.-'    -`
+                                   '-.-'     \       | .' ` '.-'-\`
+                                    /_./\_.|\_\      ;  ' .'-'.-.
+                                    /         '-._    \` /  _;-,
+                                   |         .-=-.;-._ \  -'-,
+                                   \        /      `";`-`,-"`)
+                                    \       \     '-- `\.\
+                                     '.      '._ '-- '--'/
+                                       `-._     `'----'`;
+                                           `"""--.____,/
+                                                  \\  \
+                                                  // /`
+                                              ___// /__
+                                            (`(`(---"-`)

csm-service/cms-service-user/src/main/resources/mapper/CooperationDao.xml

@@ -29,7 +29,32 @@
             (#{userAccountId}, #{d}, NOW())
         </foreach>
     </insert>
+    <insert id="addWebsiteInfo">
+        insert into website_info (`name`, address, lat, lon, `type`, user_apply_tag)
+        values (#{name}, #{address}, #{lat}, #{lon}, #{cooperationTagId}, #{id})
+    </insert>
 
+    <update id="updateWebsiteInfo">
+        update website_info
+        <set>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="address != null and address != ''">
+                address = #{address},
+            </if>
+            <if test="lat != null">
+                lat = #{lat},
+            </if>
+            <if test="lon != null">
+                lon = #{lon},
+            </if>
+            <if test="cooperationTagId != null">
+                type = #{cooperationTagId}
+            </if>
+        </set>
+        where id = #{websiteId}
+    </update>
     <update id="updateUserApplyTag" parameterType="com.mmc.iuav.user.entity.UserApplyTagDO">
         UPDATE user_apply_tag
         <set>
@@ -51,6 +76,12 @@
             <if test="remark != null">
                 remark = #{remark},
             </if>
+            <if test="content != null and content != ''">
+                content = #{content},
+            </if>
+            <if test="score != null">
+                score = #{score}
+            </if>
         </set>
         WHERE id = #{id};
     </update>
@@ -62,7 +93,10 @@
     </update>
 
     <update id="removeUserTag">
-        update user_tag set is_deleted = 1 where user_account_id = #{userAccountId} and is_deleted = 0
+        update user_tag
+        set is_deleted = 1
+        where user_account_id = #{userAccountId}
+          and is_deleted = 0
     </update>
 
     <update id="updateApplyTagStatus">
@@ -84,22 +118,33 @@
     </select>
 
     <select id="getUserApplyTag" resultType="com.mmc.iuav.user.entity.UserApplyTagDO">
-        select id,
-               cooperation_tag_id,
-               user_account_id,
-               apply_name,
-               apply_phone,
-               apply_status,
-               remark,
-               create_time
-        from user_apply_tag
-        where id = #{id}
-          and is_deleted = 0
+        SELECT ua.id,
+               ua.cooperation_tag_id,
+               ua.user_account_id,
+               ua.apply_name,
+               ua.apply_phone,
+               ua.apply_status,
+               ua.remark,
+               ua.content,
+               ua.score,
+               ua.create_time,
+               wi.address,
+               wi.`name`,
+               wi.lat,
+               wi.lon
+        FROM user_apply_tag ua
+                 LEFT JOIN website_info wi ON ua.id = wi.user_apply_tag
+        WHERE ua.id = #{id}
+          AND ua.is_deleted = 0
     </select>
 
     <select id="listUserCooperationTag" resultType="com.mmc.iuav.user.entity.CooperationTagDO">
-        select ct.id,ct.tag_name from cooperation_tag ct LEFT JOIN user_tag ut ON ct.id = ut.cooperation_tag_id
-        where ct.is_deleted = 0 and ut.is_deleted = 0 and ut.user_account_id = #{userAccountId}
+        select ct.id, ct.tag_name
+        from cooperation_tag ct
+                 LEFT JOIN user_tag ut ON ct.id = ut.cooperation_tag_id
+        where ct.is_deleted = 0
+          and ut.is_deleted = 0
+          and ut.user_account_id = #{userAccountId}
     </select>
 
     <select id="getTagById" resultType="com.mmc.iuav.user.entity.CooperationTagDO">
@@ -110,20 +155,25 @@
     </select>
     <select id="countListUserApplyTag" resultType="java.lang.Integer">
         select count(*)
-        from user_apply_tag
+        from user_apply_tag ua
+        INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
+        INNER JOIN company_auth ca ON ca.user_account_id = ua.user_account_id
         <where>
-            is_deleted = 0
+            ua.is_deleted = 0
             <if test="cooperationTagId != null">
-                and cooperation_tag_id = #{cooperationTagId}
+                and ua.cooperation_tag_id = #{cooperationTagId}
             </if>
             <if test="applyStatus != null">
-                and apply_status = #{applyStatus}
+                and ua.apply_status = #{applyStatus}
             </if>
             <if test="startTime != null and startTime != '' ">
-                and create_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d %H:%i:%s')
+                and ua.create_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != '' ">
-                and create_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d %H:%i:%s')
+                and ua.create_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="companyName != null and companyName != ''">
+                and ca.company_name like CONCAT("%",#{companyName},"%")
             </if>
         </where>
     </select>
@@ -137,10 +187,14 @@
         ua.apply_status,
         ua.remark,
         ua.create_time,
-        ct.tag_name
+        ua.content,
+        ua.score,
+        ct.tag_name,
+        ca.company_name
         FROM
         user_apply_tag ua
         INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
+        INNER JOIN company_auth ca ON ca.user_account_id = ua.user_account_id
         <where>
             ua.is_deleted = 0
             <if test="cooperationTagId != null">
@@ -155,6 +209,9 @@
             <if test="endTime != null">
                 and ua.create_time &lt;= #{endTime}
             </if>
+            <if test="companyName != null and companyName != ''">
+                and ca.company_name like CONCAT("%",#{companyName},"%")
+            </if>
         </where>
         order by ua.create_time desc
         limit #{pageNo},#{pageSize}
@@ -175,7 +232,8 @@
     </select>
 
     <select id="listUserCooperationTagByUIds" resultType="com.mmc.iuav.user.entity.CooperationTagDO">
-        select ct.id,ct.tag_name,ut.user_account_id from cooperation_tag ct LEFT JOIN user_tag ut ON ct.id = ut.cooperation_tag_id
+        select ct.id,ct.tag_name,ut.user_account_id from cooperation_tag ct LEFT JOIN user_tag ut ON ct.id =
+        ut.cooperation_tag_id
         where ct.is_deleted = 0 and ut.is_deleted = 0
         <if test="uIds != null">
             <foreach collection="uIds" item="userAccountId" separator="," open=" and ut.user_account_id in (" close=")">
@@ -183,4 +241,34 @@
             </foreach>
         </if>
     </select>
+    <select id="countServiceBitmapData" resultType="java.lang.Integer">
+        select count(*)
+        from website_info
+        where type = #{type}
+    </select>
+    <select id="listServiceBitmapData" resultType="com.mmc.iuav.user.entity.WebsiteInfoDO">
+        SELECT id,
+               `name`,
+               address,
+               lat,
+               lon,
+               `type`,
+               user_apply_tag,
+               st_distance_sphere(point(lon, lat), point(${lon}, ${lat})) as distance
+        FROM website_info
+        where type = #{type}
+        ORDER BY distance ASC
+            LIMIT #{pageNo}, #{pageSize}
+    </select>
+    <select id="getWebsiteInfoByUserApplyId" resultType="com.mmc.iuav.user.entity.WebsiteInfoDO">
+        select id,
+               `name`,
+               address,
+               lat,
+               lon,
+               `type`,
+               user_apply_tag
+        from website_info
+        where user_apply_tag = #{id}
+    </select>
 </mapper>
\ No newline at end of file

csm-service/cms-service-user/src/main/resources/mapper/RoleDao.xml

@@ -83,7 +83,7 @@
     </insert>
 
     <insert id="insertUserRoleRel">
-        INSERT INTO user_role_rel(back_back_user_account_id, role_id, create_time)
+        INSERT INTO user_role_rel(back_user_account_id, role_id, create_time)
         VALUES (#{backUserAccountId}, #{roleId}, NOW());
     </insert>
 
@@ -113,9 +113,7 @@
     </select>
 
     <delete id="removeRoleInfo" parameterType="java.lang.Integer">
-        delete
-        from role_info
-        where id = #{id}
+        update role_info set is_deleted = 1 where id = #{id}
     </delete>
 
     <delete id="batchDeleteMenuIds">
@@ -182,7 +180,7 @@
     <select id="countNotDelUserAccountByRole" resultType="java.lang.Integer">
         SELECT count(*)
         FROM user_role_rel ur
-                 INNER JOIN user_account ua ON ur.back_user_account_id = ua.id
+                 INNER JOIN back_user_account ua ON ur.back_user_account_id = ua.id
         WHERE ur.role_id = #{id}
           AND ua.is_deleted = 0
     </select>

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -21,3 +21,4 @@ data-filter:
     - /userapp/back-user/listTest
     - /userapp/company/listCompanyPageBack
     - /userapp/company/getCompanyInfoById
+    - /userapp/cooperation/service/bitmap

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: f86c973b664b1c5c6905d64cc5a98a4ed9a785bb
+  newTag: c1e73fcb0750d5461e6ebfe920c6bc14bac3e160