Merge remote-tracking branch 'origin/master'

mitao

2025-02-24 33e5113e02e32b8553c5f4edd07eb1f149594f04

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintFlow.java
#	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintFlowServiceImpl.java
#	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/sangeshenbian/SystemUserService.java

@@ -21,6 +21,6 @@
     *            用户的ID
     * @return 用户所有角色
     */
    @PostMapping("/sangeshenbian/sangeshenbian/getUserById")
    @PostMapping("/systemUser/getUserById")
    R<SystemUserVo> getUserById(@RequestParam("id") String id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java

@@ -23,7 +23,7 @@
 */
@Api
@RestController
@RequestMapping("/sangeshenbian/banner")
@RequestMapping("/banner")
public class BannerController extends BaseController {
    
    @Resource

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/DepartmentController.java

@@ -23,7 +23,7 @@
 */
@Api
@RestController
@RequestMapping("/sangeshenbian/department")
@RequestMapping("/department")
public class DepartmentController {
    
    @Resource

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MessageNotificationController.java

@@ -5,6 +5,7 @@
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.sangeshenbian.model.entity.MessageNotification;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.service.IMessageNotificationService;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.warpper.MessageNotificationList;
@@ -21,7 +22,7 @@

@Api
@RestController
@RequestMapping("/sangeshenbian/messageNotification")
@RequestMapping("/messageNotification")
public class MessageNotificationController extends BaseController {
    
    @Resource
@@ -30,10 +31,32 @@
    @Resource
    private ISystemUserService systemUserService;
    
	
	
    @GetMapping("/list")
    @ApiOperation(value = "获取消息通知列表", tags = {"三个身边后台-消息通知"})
    @OperLog(operModul = "三个身边后台",operType = 0, businessType = "获取消息通知列表")
    public R<IPage<MessageNotification>> list(MessageNotificationList query) {
        Integer id = this.getLoginUserInfoSanGeShenBian().getId();
        SystemUser systemUser = systemUserService.getById(id);
        switch (systemUser.getAccountLevel()){
            case 1:
                query.setUserId("510400");
                break;
            case 2:
                query.setUserId(systemUser.getDistrictsCode());
                break;
            case 3:
                query.setUserId(systemUser.getStreetId().toString());
                break;
            case 4:
                query.setUserId(systemUser.getCommunityId().toString());
                break;
            case 5:
                query.setUserId(id.toString());
                break;
        }
        query.setUndertakerType(systemUser.getAccountLevel());
        IPage<MessageNotification> page = messageNotificationService.list(query);
        return R.ok(page);
    }
@@ -57,9 +80,30 @@
    @ApiOperation(value = "获取未读数量", tags = {"三个身边后台-消息通知"})
    @OperLog(operModul = "三个身边后台",operType = 0, businessType = "获取未读数量")
    public R unreadCount() {
        Integer id = this.getLoginUserInfoSanGeShenBian().getId();
        SystemUser systemUser = systemUserService.getById(id);
        String userId = null;
        switch (systemUser.getAccountLevel()){
            case 1:
                userId = "510400";
                break;
            case 2:
                userId = systemUser.getDistrictsCode();
                break;
            case 3:
                userId = systemUser.getStreetId().toString();
                break;
            case 4:
                userId = systemUser.getCommunityId().toString();
                break;
            case 5:
                userId = id.toString();
                break;
        }
        Integer count = messageNotificationService.lambdaQuery()
                .eq(MessageNotification::getReadStatus, 0)
                .eq(MessageNotification::getUndertakerUserId, getUserId())
                .eq(MessageNotification::getUndertakerType, systemUser.getAccountLevel())
                .eq(MessageNotification::getUndertakerUserId, userId)
                .count();
        return R.ok(count);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java

@@ -24,7 +24,7 @@
 */
@Api
@RestController
@RequestMapping("/sangeshenbian/problemType")
@RequestMapping("/problemType")
public class ProblemTypeController extends BaseController {
    
    @Resource

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemMenuController.java

@@ -19,7 +19,7 @@
 */
@Api
@RestController
@RequestMapping("/sangeshenbian/systemMenu")
@RequestMapping("/systemMenu")
public class SystemMenuController {
    
    @Resource

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemRoleController.java

@@ -25,7 +25,7 @@
 */
@Api
@RestController
@RequestMapping("/sangeshenbian/systemRole")
@RequestMapping("/systemRole")
public class SystemRoleController extends BaseController {
    
    @Resource

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java

@@ -38,7 +38,7 @@
 */
@Api
@RestController
@RequestMapping("/sangeshenbian/systemUser")
@RequestMapping("/systemUser")
public class SystemUserController extends BaseController {
    
    @Resource

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/WorkOrderItemConfigController.java

@@ -16,7 +16,7 @@
 */
@Api
@RestController
@RequestMapping("/sangeshenbian/workOrderItemConfig")
@RequestMapping("/workOrderItemConfig")
public class WorkOrderItemConfigController {
    
    @Resource

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/BannerMapper.java

@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.sangeshenbian.model.entity.Banner;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @author zhibing.pu
 * @Date 2025/2/23 2:44
 */
@Mapper
public interface BannerMapper extends BaseMapper<Banner> {
    
    

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/DepartmentMapper.java

@@ -1,11 +1,13 @@
package com.panzhihua.sangeshenbian.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.sangeshenbian.model.entity.Department;

/**
 * @author zhibing.pu
 * @Date 2025/2/19 17:42
 */
@Mapper
public interface DepartmentMapper extends BaseMapper<Department> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/MessageNotificationMapper.java

@@ -5,12 +5,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.sangeshenbian.model.entity.MessageNotification;
import com.panzhihua.sangeshenbian.warpper.MessageNotificationList;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @author zhibing.pu
 * @Date 2025/2/23 3:03
 */
@Mapper
public interface MessageNotificationMapper extends BaseMapper<MessageNotification> {
    
    

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ProblemTypeMapper.java

@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.sangeshenbian.model.entity.ProblemType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @author zhibing.pu
 * @Date 2025/2/23 2:25
 */
@Mapper
public interface ProblemTypeMapper extends BaseMapper<ProblemType> {
    
    

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/SystemMenuMapper.java

@@ -1,11 +1,13 @@
package com.panzhihua.sangeshenbian.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.sangeshenbian.model.entity.SystemMenu;

/**
 * @author zhibing.pu
 * @Date 2025/2/23 1:02
 */
@Mapper
public interface SystemMenuMapper extends BaseMapper<SystemMenu> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/SystemRoleMapper.java

@@ -5,12 +5,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.sangeshenbian.model.entity.SystemRole;
import com.panzhihua.sangeshenbian.warpper.SystemRoleListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @author zhibing.pu
 * @Date 2025/2/19 16:40
 */
@Mapper
public interface SystemRoleMapper extends BaseMapper<SystemRole> {
    
    

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/SystemRoleMenuMapper.java

@@ -1,11 +1,13 @@
package com.panzhihua.sangeshenbian.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.sangeshenbian.model.entity.SystemRoleMenu;

/**
 * @author zhibing.pu
 * @Date 2025/2/19 17:24
 */
@Mapper
public interface SystemRoleMenuMapper extends BaseMapper<SystemRoleMenu> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/WorkOrderItemConfigMapper.java

@@ -1,11 +1,13 @@
package com.panzhihua.sangeshenbian.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.sangeshenbian.model.entity.WorkOrderItemConfig;

/**
 * @author zhibing.pu
 * @Date 2025/2/23 2:06
 */
@Mapper
public interface WorkOrderItemConfigMapper extends BaseMapper<WorkOrderItemConfig> {
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/MessageNotification.java

@@ -35,7 +35,13 @@
     */
    @TableField("undertaker_user_id")
    @ApiModelProperty("承办者用户id")
    private Integer undertakerUserId;
    private String undertakerUserId;
    /**
     * 承办人类型（1=市级，2=区县，3=街道，4=社区，5=党员）
     */
    @TableField("undertaker_type")
    @ApiModelProperty("承办人类型（1=市级，2=区县，3=街道，4=社区，5=党员）")
    private Integer undertakerType;
    /**
     * 承办者
     */

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java

@@ -89,7 +89,7 @@
     * 账号层级（1=市级账号，2=区县账号，3=街道账号，4=社区账号）
     */
    @TableField("account_level")
    @ApiModelProperty(value = "账号层级（1=市级账号，2=区县账号，3=街道账号，4=社区账号）", required = true)
    @ApiModelProperty(value = "账号层级（1=市级账号，2=区县账号，3=街道账号，4=社区账号，5=党员账号）", required = true)
    private Integer accountLevel;
    /**
     * 所属区县
@@ -110,11 +110,11 @@
    @ApiModelProperty(value = "街道")
    private String street;
    /**
     * 街道编号
     * 街道ID
     */
    @TableField("street_code")
    @ApiModelProperty(value = "街道编号")
    private String streetCode;
    @TableField("street_id")
    @ApiModelProperty(value = "街道ID")
    private Integer streetId;
    /**
     * 社区
     */
@@ -122,11 +122,11 @@
    @ApiModelProperty(value = "社区")
    private String community;
    /**
     * 社区编号
     * 社区ID
     */
    @TableField("community_code")
    @ApiModelProperty(value = "社区编号")
    private String communityCode;
    @TableField("community_id")
    @ApiModelProperty(value = "社区ID")
    private Integer communityId;
    /**
     * 状态（1=正常，2=冻结，3=删除）
     */

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintFlowServiceImpl.java

@@ -12,6 +12,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java

@@ -31,8 +31,10 @@
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -124,11 +126,11 @@
                    break;
                case 3:
                    //街道
                    targetId = systemUser.getStreetCode();
                    targetId = systemUser.getStreetId().toString();
                    break;
                case 4:
                    //社区
                    targetId = systemUser.getCommunityCode();
                    targetId = systemUser.getCommunityId().toString();
                    break;
            }
            isSuperior = 1;
@@ -226,7 +228,7 @@

            // 使用基本类型比较并补充默认分支
            if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
                superiorId = Long.parseLong(adminUser.getStreetCode());
                superiorId = adminUser.getStreetId().longValue();
            } else if (accountLevel == ReportTypeEnum.STREET.getCode()) {
                superiorId = Long.parseLong(adminUser.getDistrictsCode());
            } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
@@ -274,9 +276,9 @@

        // 使用基本类型比较并补充默认分支
        if (accountLevel == ReportTypeEnum.STREET.getCode()) {
            superiorId = Long.parseLong(adminUser.getCommunityCode());
            superiorId = adminUser.getCommunityId().longValue();
        } else if (accountLevel == ReportTypeEnum.DISTRICT.getCode()) {
            superiorId = Long.parseLong(adminUser.getStreetCode());
            superiorId = adminUser.getStreetId().longValue();
        } else if (accountLevel == ReportTypeEnum.CITY.getCode()) {
            superiorId = Long.parseLong(adminUser.getDistrictsCode());
        } else {
@@ -398,11 +400,11 @@
                    break;
                case 3:
                    //街道
                    targetId = systemUser.getStreetCode();
                    targetId = systemUser.getStreetId().toString();
                    break;
                case 4:
                    //社区
                    targetId = systemUser.getCommunityCode();
                    targetId = systemUser.getCommunityId().toString();
                    break;
            }
            isSuperior = 1;

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MessageNotificationList.java

@@ -25,4 +25,8 @@
    private Integer pageNum;
    @ApiModelProperty("每页数")
    private Integer pageSize;
	
    private Integer undertakerType;
	
    private String userId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/MessageNotificationMapper.xml

@@ -21,7 +21,7 @@
        left join sgsb_system_user c on (a.phone = c.phone)
        left join sgsb_department d on (c.department_id = d.id)
        left join sgsb_position e on (c.position_id = e.id)
        where 1=1
        where a.undertaker_type = #{query.undertakerType} and a.undertaker_user_id = #{query.userId}
        <if test="query.title != null and query.title != ''">
            and a.title like concat('%', #{query.title}, '%')
        </if>