Pu Zhibing
2025-02-27 dd8ba2862f97f79caeaef780dfc709985b669ccc
修改管理后台接口bug
8个文件已修改
67 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/DepartmentController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemMenuServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/BannerMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/MessageNotificationMapper.xml 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/SystemUserMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -32,14 +32,6 @@
 **/
@Slf4j
public class BaseController {
    public static void main(String[] args) {
        byte[] bytes = AES.parseHexStr2Byte(
            "5730CB290AD203B32D2FA4347CD54A50A684E16D2C7A4544CF352D54D8A763BA6652C323B13BEEE682A5095B8BCC76842225A914253CE84AFB6B58A9D1BE30A7992786E151A933FDEC6EBDCD1928CA68927047770F296F7541268149B34FDFCEF1340CF2266A041484744CB45B216EE8B4D96E243098F9CB3F661ACA7AF356C422BFE9A009FA478DF606A71DA7DBD776527E5120C3F13281BA8FC5587BACD5E403EE069762B5CF060BFA3CF4FD3417F5653CC178D2CA117284D85F442C0FAB076DB6F6D873B5363FAB93EBA9284CC87A5E97243EF4DC73F1ADA57BD9E9AAB2E4972AC3A4615B2DF6F9062BC04428D1B84B6C892A306F191B1D9DDBBB201D2767CE928020489AFC6BCFDC8A74F8C95080F74B4EC64AD1A6354B17A156B95AA9467C7461BD3C3F15F8F65BD7F3272184435D77003738B5B942EEA9603CFF249764718732595EC44DE4ED1BB763F9C88BAFACF5540E689FE84A4702E31D3D1D05BAC25C10F8E0C3948C777478537397BCB67D37066385DFCBDE3F4A53D6BA14481DBCB07E8452ACD2790A76669A9DE6D7080C8CFD9FB774035FCC3AC1C436581144969B7150318024A2E893FE926654E002097EB4735E49F3A9698A405969888A7D88A55A0FA60318C4A1E2D243BEE6D438");
        byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
        System.out.println(decrypt);
        String s = new String(decrypt);
        System.out.println(s);
    }
    /**
     * 获取request对象
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java
@@ -1,5 +1,6 @@
package com.panzhihua.sangeshenbian.api;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
@@ -86,10 +87,7 @@
        if(systemUser.getAccountLevel() != 1){
            return R.fail("删除失败");
        }
        Banner banner = new Banner();
        banner.setId(id);
        banner.setDel(1);
        bannerService.updateById(banner);
        bannerService.update(new UpdateWrapper<Banner>().eq("id", id).set("del", 1));
        return R.ok();
    }
    
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/DepartmentController.java
@@ -36,7 +36,7 @@
    @GetMapping("/list")
    @ApiOperation(value = "获取单位列表", tags = {"三个身边后台-用户管理"})
    @OperLog(operModul = "三个身边后台",operType = 0, businessType = "获取单位列表")
    public R<List<Department>> list(){
    public R<List<Department>> list(String name){
        List<Department> list = departmentService.list();
        List<Department> departmentList1 = list.stream().filter(s -> s.getPid() == 0).collect(Collectors.toList());
        for (Department department : departmentList1) {
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java
@@ -1,6 +1,7 @@
package com.panzhihua.sangeshenbian.api;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
@@ -97,10 +98,7 @@
        if(systemUser.getAccountLevel() != 1){
            return R.fail("删除失败");
        }
        ProblemType problemType = new ProblemType();
        problemType.setId(id);
        problemType.setDel(1);
        problemTypeService.updateById(problemType);
        problemTypeService.update(new UpdateWrapper<ProblemType>().eq("id", id).set("del", 1));
        return R.ok();
    }
    
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemMenuServiceImpl.java
@@ -23,12 +23,12 @@
        for (SystemMenu systemMenu : collect) {
            build(systemMenu, list);
        }
        return list;
        return collect;
    }
    
    
    public void build(SystemMenu systemMenu, List<SystemMenu> list) {
        List<SystemMenu> collect = list.stream().filter(s->s.getParentId().equals(systemMenu.getParentId())).collect(Collectors.toList());
        List<SystemMenu> collect = list.stream().filter(s->s.getParentId().intValue() == systemMenu.getId()).collect(Collectors.toList());
        if(collect.size() == 0){
            return;
        }
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/BannerMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.panzhihua.sangeshenbian.dao.BannerMapper">
    <select id="list" resultType="com.panzhihua.sangeshenbian.model.entity.Banner">
        select * from banner where del = 0
        select * from sgsb_banner where del = 0
        <if test="name != null and name != ''">
            and name like concat('%',#{name},'%')
        </if>
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/MessageNotificationMapper.xml
@@ -9,33 +9,42 @@
        select
            a.id,
            a.title,
            b.name as undertakerUser,
            IF(a.undertaker_type = 1, b1.region_name, IF(a.undertaker_type = 2, b2.region_name, IF(a.undertaker_type = 3, b3.name, IF(a.undertaker_type = 4, b4.name, b5.name)))) as undertakerUser,
            a.phone,
            d.name as department,
            ifnull(d4.name, ifnull(d3.name, ifnull(d2.name, d1.name))) as department,
            e.name as `position`,
            DATE_FORMAT(a.response_time, '%Y-%m-%d')as responseTime,
            if(a.prompt_type = 1, '临期提醒', '超时提醒') as promptType,
            if(a.read_status = 0, '未读', '已读') as readStatus
            a.response_time as responseTime,
            a.prompt_type as promptType,
            a.read_status as readStatus
        from sgsb_message_notification a
        left join sys_user b on (a.undertaker_user_id = b.id)
        left join sys_user b5 on (a.undertaker_user_id = b5.user_id and a.undertaker_type = 5)
        left join com_act b4 on (a.undertaker_user_id = b4.community_id and a.undertaker_type = 4)
        left join com_street b3 on (a.undertaker_user_id = b3.street_id and a.undertaker_type = 3)
        left join bc_region b2 on (a.undertaker_user_id = b2.region_code and a.undertaker_type = 2)
        left join bc_region b1 on (a.undertaker_user_id = b1.region_code and a.undertaker_type = 1)
        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)
        left join sgsb_department d1 on (c.one_department_id = d1.id)
        left join sgsb_department d2 on (c.two_department_id = d2.id)
        left join sgsb_department d3 on (c.three_department_id = d3.id)
        left join sgsb_department d4 on (c.four_department_id = d4.id)
        left join sgsb_system_post e on (c.system_post_id = e.id)
        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>
        <if test="query.undertakerUser != null and query.undertakerUser != ''">
            and b.name like concat('%', #{query.undertakerUser}, '%')
        <if test="query.undertaker != null and query.undertaker != ''">
            and (b5.name like concat('%', #{undertaker}, '%') or b4.name like concat('%', #{undertaker}, '%') or b3.name like concat('%', #{undertaker}, '%') or
            b2.region_name like concat('%', #{undertaker}, '%') or b1.region_name like concat('%', #{undertaker}, '%'))
        </if>
        <if test="query.phone != null and query.phone != ''">
            and a.phone like concat('%', #{query.phone}, '%')
        </if>
        <if test="query.departmentId != null">
            and c.department_id = #{query.department}
            and (c.one_department_id = #{query.departmentId} or c.two_department_id = #{query.departmentId} or
                 c.three_department_id = #{query.departmentId} or c.four_department_id = #{query.departmentId})
        </if>
        <if test="query.positionId != null">
            and c.position_id = #{query.position}
            and c.system_post_id = #{query.positionId}
        </if>
        order by a.read_status asc, a.create_time desc
    </select>
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/SystemUserMapper.xml
@@ -23,8 +23,8 @@
        left join sgsb_system_post f on (a.system_post_id = f.id)
        left join sgsb_system_role g on (a.system_role_id = g.id)
        where a.`status` != 3
        <if test="1 != accountLevel or 5 != accountLevel">
            and a.account_level &lt;= #{accountLevel}
        <if test="1 != accountLevel and 5 != accountLevel">
            and a.account_level >= #{accountLevel}
        </if>
        <if test="5 == accountLevel">
            and a.id = 0
@@ -55,7 +55,7 @@
    
    
    <select id="getStreet" resultType="map">
        select street_id as id, name as name from com_street where area_code = #{pcode}
        select street_id as id, name as name from com_street where area_code = #{areaCode}
    </select>