Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-17 783e768b0d8b2956cf5dd10e44a7347772338232

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/AgreementController.java

@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;

@Api(tags = {"相关协议接口"})
@@ -51,7 +52,9 @@
    @ApiOperation(value = "修改相关附件",response = Agreement.class)
    @PostMapping(value = "/update")
    @Authorization
    public ResultData update(@RequestBody Agreement agreement,@CurrentUser SysUser sysUse){
    public ResultData update(@RequestBody Agreement agreement,@CurrentUser SysUser sysUse)
    {
        agreement.setUpdateTime(LocalDateTime.now());
        agreement.setUpdateUserId(sysUse.getUserId().toString());
        return agreementService.update(agreement);
    }

 flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java

@@ -83,4 +83,25 @@
    ResultData delete( @RequestParam(value = "id") Integer id){
        return  iAutomessageCommonProblemService.delete(id);
    }



    /**
     * 获取常见问题列表（分页）
     * @param title
     * @param content
     * @return
     */
    @ApiOperation(value = "获取常见问题列表（分页）(不加token)",response = AutomessageCommonProblem.class)
    @GetMapping("/selectConfigListNoToken")
    public TableDataInfo selectConfigListNoToken(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "title",required = false) String title,
                                          @RequestParam(value = "content",required = false) String content){
        Page<AutomessageCommonProblem> pageParam = new Page<>(pageNum,pageSize);
        List<AutomessageCommonProblem> list = iAutomessageCommonProblemService.selectConfigList(pageParam,pageSize,title,content);
        int num=iAutomessageCommonProblemService.countAutomessageCommonProblem(title,content);
        return getDataTable(list,num);
    }

}

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -100,6 +100,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());

            return ResultData.success(map);
        }
@@ -125,6 +126,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());

            return ResultData.success(map);
        }

 flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java

@@ -77,4 +77,9 @@
    @ApiModelProperty(name = "ClassifyAdministrationEntityList", value = "下级分类")
    private List<ClassifyAdministration> ClassifyAdministrationEntityList;

    @TableField(exist = false)
    @ApiModelProperty(name = "transactNum", value = "办理事项数量")
    private String transactNum;
    

}

 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -244,6 +244,14 @@
    private Integer transactionNum;


    @TableField(exist = false)
    @ApiModelProperty("权限资格")
    private String permission;

    @TableField(exist = false)
    @ApiModelProperty("角色名称")
    private String roleName;



}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -18,6 +18,7 @@
public interface SysUserMapper extends BaseMapper<SysUser> {

    SysUser getUserById(Long id);

    SysUser getUserByAccount(String account);

    /**

 flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java

@@ -69,7 +69,7 @@
                if(huaChengSysUser!=null && huaChengSysUser.getUserId()!=0 )
                {
                    SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone());
                    if(sysUser==null && sysUser.getUserId()<0)
                    if(sysUser==null)
                    {
                        //本地没有此用户  新用户
                        SysUser newSysUser=new SysUser();

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -69,7 +69,13 @@
     */
    int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState,List<String> classifyIds);


    /**
     * 统计数据
     * @param state
     * @param ids
     * @param time
     * @return
     */
    List<CountListNum> countListNum(String state,
                                    List<String> ids,
                                    Integer time);

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -49,13 +49,8 @@

    @Override
    public SysUser getUserByAccount(String account) {
        HashMap<String, Object> map = new HashMap();
        map.put("login_name", account);
        List<SysUser> sysUsers = baseMapper.selectByMap(map);
        if (sysUsers.size() > 0) {
            return sysUsers.get(0);
        }
        return null;
        SysUser sysUsers = baseMapper.getUserByAccount(account);
        return sysUsers;
    }

    @Override

 flower_city/src/main/resources/mapper/AgreementMapper.xml

@@ -14,9 +14,12 @@
    <sql id="selectAgreement">
        select id,agreement,
               (select user_name from automessage_sys_user where user_id=a.update_user_id)updateUserName,
               update_user_id,create_time,
               update_user_id,
               create_time,
               update_time,
               (select user_name from automessage_sys_user where user_id=a.create_user_id)createUserName,
               create_user_id,agreement_content FROM automessage_agreement a
               create_user_id,agreement_content
        FROM automessage_agreement a
   </sql>

    <select id="selectConfigList" resultMap="AgreementResult">

 flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml

@@ -22,7 +22,10 @@
            parent_id,
            (select ca.classify_name from automessage_classify_administration as ca where ca.id= automessage_classify_administration.parent_id) as parentName,
            classify_name,
            classify_icon
            classify_icon,
            (IF(classify_grade = '2',(SELECT count(id) FROM automessage_transaction_event WHERE automessage_transaction_event.classify_id=automessage_classify_administration.id),
                (SELECT count(id) FROM automessage_transaction_event WHERE automessage_transaction_event.classify_id in (SELECT id FROM automessage_classify_administration
                WHERE automessage_classify_administration.parent_id=automessage_transaction_event.classify_id))))  as  transactNum
        FROM
            automessage_classify_administration
    </sql>

 flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml

@@ -59,7 +59,7 @@
                </foreach>
            </if>
        </where>

        order by create_time desc
    </select>



 flower_city/src/main/resources/mapper/RoleManagementMapper.xml

@@ -80,7 +80,7 @@
            <if test="updateUserId != null and updateUserId != '' ">update_user_id=#{updateUserId},</if>
            update_time=sysdate()
        </set>
        where  id= #{Id}
        where  id= #{id}
    </update>

    <delete id="deleteConfigById" parameterType="string">

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -73,6 +73,8 @@
            transaction_names,
            openid,
            transaction_num,
            (select role_name from automessage_role_management where automessage_role_management.id=role_ids) as roleName,
            (select permission from automessage_role_management where automessage_role_management.id=role_ids) as permission,
            (select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name
        FROM
            automessage_sys_user
@@ -127,20 +129,29 @@
        </where>
    </select>

    <select id="getUserByAccount" parameterType="string"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
        <where>
            <if test="account!=null and account!='' ">
                login_name= #{account}
            </if>
        </where>
    </select>


    <select id="selectListByDepartmentId"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
         <where>
             user_type=2 and status=0
        <if test="list!=null">
            and  department_id in
            <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
                #{id}
            </foreach>
         </if>
         <if test="classifyIdFront!=null and classifyIdFront!='' and classifyIdAfter!=null and classifyIdAfter!=''">
            and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
         </if>
            user_type=2 and status=0
            <if test="list!=null">
                and  department_id in
                <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
                    #{id}
                </foreach>
             </if>
             <if test="classifyIdFront!=null and classifyIdFront!='' and classifyIdAfter!=null and classifyIdAfter!=''">
                and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
             </if>

         </where>
         order by transaction_num
@@ -148,7 +159,7 @@


    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
        insert into automessage_sys_user (
        insert ignore into automessage_sys_user (
        create_time
        <if test="userId != null and userId != '' ">,user_id</if>
        <if test="loginName != null and loginName != '' ">,login_name</if>

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysOperLogVO.java

@@ -1,12 +1,11 @@
package com.panzhihua.common.model.vos.user;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -83,4 +82,12 @@

    @ApiModelProperty("如果是修改操作，记录修改前的记录")
    private String beforeUpdateData;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("开始时间")
    private String startTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty("截止时间")
    private String endTime;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

@@ -1142,6 +1142,18 @@
    }

    /**
     * 获取之前的日期
     *
     * @return
     */
    public static String getBeforeDay(Integer amount) {
        Calendar cal = Calendar.getInstance();
        cal.setTime(new Date());
        cal.add(Calendar.DATE, -amount);
        return DateUtil.format(cal.getTime(),"yyyy-MM-dd");
    }

    /**
     * 获取最近本月20天数据
     *
     * @return

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java

@@ -90,7 +90,7 @@
    /**撤销类型 1 用户 2 社区3、街道4、行业分中心*/
    @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心")
    private Integer revokeType;
    /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/
    /**工作人员的事件处理状态1待处理2待分配3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/
    @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案7已归档8调解取消9已删除")
    private Integer eventProcessStatus;
    /**当前处理对象类型（1、行业分中心2、社区3、是街道4、区三说会堂,5专家）*/

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventTransferRecord.java

@@ -78,7 +78,7 @@
    private Integer processType;
    /**创建时间*/
    @ApiModelProperty(name = "createAt", value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createAt;
    /**选择调解专家ID*/
    @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -166,10 +166,10 @@

    /**
     * 当前账号对事件的操作权限
     * 有权限 0无权限
     * 1有权限 0无权限
     * 1、用户提交调解申请后，调解专家状态为待受理，可操作受理、查看，专家所在部门状态为待受理，可操作受理（帮专家进行受理处理）、查看、删除，
     * 所在部门上级部门状态为待受理，仅可查看、删除；
     * 2、专家拒绝受理后，专家看不到该调解申请，所在单位状态变为待分配，可操作分配、调解、查看、删除，所在单位的上级单位状态变为待分配，仅可查看、删除；
     * 所在部门上级部门状态为待受理，仅可查看、删除；ok
     * 2、专家拒绝受理后，专家看不到该调解申请，所在单位状态变为待分配，可操作分配、调解、查看、删除，所在单位的上级单位状态变为待分配，仅可查看、删除； ok
     * 3、专家受理后，专家状态变为调解中，可操作调解、查看，专家所在部门状态变为调解中，可操作调解、查看、删除，专家做在单位的上级单位状态变为调解中，仅可查看、删除；
     * 4、专家调解调解完成未上报上级，专家状态变为已完成、可操作归档、查看，专家所在部门状态变为已完成，可操作归档、查看，专家所在部门的上级单位状态变为已完成，
     * 可查看、删除；
@@ -208,10 +208,17 @@
                //账号获取
                expert = comSanShuoExpertService.getOne(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getAccount, loginUserInfoVO.getAccount()));
            }
            if (!comEvent.getSpecialistId().equals(expert.getId()) || !comEvent.getCurrentProcessType().equals(5)){
            if (!comEvent.getCurrentProcessType().equals(5)){
                if (comEvent.getSpecialistId().equals(expert.getId()) && comEvent.getEventProcessStatus().equals(3)){
                    //更高级别分配给该专家，可以受理
                    comEvent.setConciliation(0);
                    comEvent.setArchive(0);
                    //comEvent.setSolve(0);
                    return;
                }
                //已经上报或者重新分配专家,只能查看
                comEvent.setConciliation(0);
                comEvent.setArchive(0);
                //comEvent.setArchive(0);
                comEvent.setSolve(0);
                return;
            }//未上报,根据状态决定权限
@@ -223,35 +230,95 @@
            } else if (comEvent.getEventProcessStatus().equals(5)){
                //调解中，可以查看，调解
                comEvent.setArchive(0);
                comEvent.setSolve(0);
            }else if (comEvent.getEventProcessStatus().equals(3)){
                //重新分配给该专家的事件，可以进行受理
               // comEvent.setSolve(0);
                comEvent.setConciliation(0);
                comEvent.setArchive(0);
            } else if (comEvent.getEventProcessStatus().equals(6)){
                //调解完成，可以归档,查看
                comEvent.setSolve(0);
                comEvent.setConciliation(0);
            }
        }else if (userType.equals(4)){
            //社区后台权限
            //如果未上报到街道，当前事件权限和专家一样
            if (comEvent.getCurrentProcessType().equals(5) || comEvent.getCurrentProcessType().equals(2)){
            if (comEvent.getCurrentProcessType().equals(5)){
                //根据事件状态决定权限
                if (comEvent.getEventProcessStatus().equals(1) || comEvent.getEventProcessStatus().equals(2)){
                    //待受理和待验证状态，可以受理，分配专家
                    //关闭调解和归档
                    comEvent.setArchive(0);
                    comEvent.setConciliation(0);
                    comEvent.setChangeExpert(0);
                } else if (comEvent.getEventProcessStatus().equals(5)){
                    //调解中，可以查看，调解，更换专家,删除
                    comEvent.setDistribution(0);
                    comEvent.setSolve(0);
                    comEvent.setArchive(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setConciliation(0);
                }
            }else{
            }else if (comEvent.getCurrentProcessType().equals(2)){
                //上报到社区后，增加分配专家权限
                if (comEvent.getEventProcessStatus().equals(1) || comEvent.getEventProcessStatus().equals(2)){
                    //待受理和待验证状态，可以受理，更换专家
                    //关闭调解和归档
                    comEvent.setArchive(0);
                    comEvent.setConciliation(0);
                    comEvent.setDistribution(0);
                }
                else if (comEvent.getEventProcessStatus().equals(3)){
                    //分配新专家后
                    comEvent.setDistribution(0);
                    comEvent.setArchive(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setSolve(0);
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(1);
                }else if (comEvent.getEventProcessStatus().equals(5)){
                    //调解中，可以查看，调解，更换专家,删除
                    comEvent.setSolve(0);
                    comEvent.setArchive(0);
                    comEvent.setDistribution(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
                    //上报并且调解失败，此时事件的状态为6，事件结果为调解失败
                    //comEvent.setDistribution(0);
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(2);
                    comEvent.setChangeExpert(0);
                    comEvent.setSolve(0);
                    //comEvent.setConciliation(0);
                    comEvent.setArchive(0);
                }else if (comEvent.getEventProcessStatus().equals(6)  && comEvent.getEventResult().equals(2) && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
                    //关闭所有权限
                    comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setSolve(0);
                    comEvent.setConciliation(0);
                    //comEvent.setArchive(0);
                }
                else if (comEvent.getEventProcessStatus().equals(6)  && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
                    //关闭所有权限
                    comEvent.setDistribution(0);
                    comEvent.setSolve(0);
                    comEvent.setArchive(0);
                }
            }
            else{
                //已上报到街道或三说会堂，社区没有分配和受理权限权限
                comEvent.setDistribution(0);
                comEvent.setChangeExpert(0);
                comEvent.setDelete(0);
                //comEvent.setDelete(0);
                comEvent.setSolve(0);
                comEvent.setConciliation(0);
            }
        }else if (userType.equals(3)){
            //分配行业分中心操作权限
@@ -263,11 +330,28 @@
                    //关闭调解和归档
                    comEvent.setArchive(0);
                    comEvent.setConciliation(0);
                } else if (comEvent.getEventProcessStatus().equals(5)){
                }
                else if (comEvent.getEventProcessStatus().equals(3)){
                    //分配新专家后
                    comEvent.setDistribution(0);
                    comEvent.setArchive(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setSolve(0);
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(1);
                }else if (comEvent.getEventProcessStatus().equals(5)){
                    //调解中，可以查看，调解，更换专家,删除
                    comEvent.setDistribution(0);
                    comEvent.setArchive(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                }  else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
                    //调解完成，可以归档,查看
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(2);
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
                }
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
@@ -290,15 +374,41 @@
                    //关闭调解和归档
                    comEvent.setArchive(0);
                    comEvent.setConciliation(0);
                    comEvent.setChangeExpert(0);
                    //comEvent.setDistribution(0);
                    comEvent.setSolve(0);
                } else if (comEvent.getEventProcessStatus().equals(5)){
                    //调解中，可以查看，调解，更换专家,删除
                    comEvent.setDistribution(0);
                    comEvent.setArchive(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    comEvent.setSolve(0);
                }else if (comEvent.getEventProcessStatus().equals(3)){
                    //分配新专家后
                    comEvent.setDistribution(0);
                    comEvent.setArchive(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setSolve(0);
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(1);
                }
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
                    //设置为待受理
                    comEvent.setEventResult(null);
                    comEvent.setEventProcessStatus(2);
                    //上报到单位，并且调解失败，
                    //调解完成，可以归档,查看
                    comEvent.setSolve(0);
                    //comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
                    //comEvent.setConciliation(0);
                    comEvent.setArchive(0);
                }
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setConciliation(0);
                }
            }else{
                //未上报到街道，仅查看
@@ -306,6 +416,7 @@
                comEvent.setSolve(0);
                comEvent.setDistribution(0);
                comEvent.setChangeExpert(0);
                comEvent.setConciliation(0);
            }
        }else if (isAdmin){
            //区三说会堂账号，最高权限全部开放
@@ -316,13 +427,32 @@
                    //待受理和待验证状态，可以受理，分配专家
                    //关闭调解和归档
                    comEvent.setArchive(0);
                    comEvent.setSolve(0);
                    comEvent.setConciliation(0);
                } else if (comEvent.getEventProcessStatus().equals(5)){
                    //调解中，可以查看，调解，更换专家,删除
                    comEvent.setChangeExpert(0);
                } else if (comEvent.getEventProcessStatus().equals(3)){
                    //新分配给专家并且专家还未受理
                    comEvent.setDistribution(0);
                    comEvent.setArchive(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    //comEvent.setConciliation(0);
                    comEvent.setChangeExpert(0);
                    comEvent.setSolve(0);
                }
                else if (comEvent.getEventProcessStatus().equals(5)){
                    //调解中，可以查看，调解，更换专家,删除
                    comEvent.setDistribution(0);
                    comEvent.setSolve(0);
                    comEvent.setArchive(0);
                } else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventResult().equals(1)){
                    //失败后转交三说会堂
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    comEvent.setConciliation(0);
                    //comEvent.setChangeExpert(0);
                }
                else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
                    //调解完成，可以归档,查看
                    comEvent.setConciliation(0);
                    comEvent.setSolve(0);
                    comEvent.setDistribution(0);
                    comEvent.setChangeExpert(0);
@@ -333,6 +463,7 @@
                comEvent.setSolve(0);
                comEvent.setDistribution(0);
                comEvent.setChangeExpert(0);
                comEvent.setConciliation(0);
            }
        }
    }
@@ -670,7 +801,7 @@
        ComSanshuoExpert specter = comSanShuoExpertService.getById(specialistId);
        comEvent.setSpecialistAcceptTime(new Date());
        comEvent.setSpecialistName(specter.getName());
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.ACCEPT.getCode());
        comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
        int flag = baseMapper.updateById(comEvent);
        //添加一条对应记录
        comEventMapper.insertEventAndExpertRecord(id, specialistId,1);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java

@@ -269,7 +269,7 @@
                    ExpertRangeVO vo=new ExpertRangeVO();
                    vo.setLevel(4);
                    vo.setName(comActDO.getName()+"调解站");
                    vo.setId(loginUserInfo.getStreetId());
                    vo.setId(loginUserInfo.getCommunityId());
                    list.add(vo);
                    return R.ok(list);
                }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml

@@ -147,7 +147,7 @@
        order by create_at desc
    </select>
    <select id="listEventIds" resultType="java.lang.Long">
        select event_id from com_sanshuo_expert_event where expert_id=#{expertId} and status=0
        select event_id from com_sanshuo_expert_event where expert_id=#{expertId} and status=0 or status=1
    </select>
    <select id="listByComEvent" resultType="com.panzhihua.service_community.entity.ComEvent">
        SELECT <include refid="columns" />

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -38,6 +38,7 @@
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.model.dtos.UsersStatisticsDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;
@@ -352,9 +353,9 @@
     * */
    Map<String,Long> getDailyAddAndActive(@Param("date") Date date, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);

    Map<String, Long> getDailyAdd(@Param("createAt") String createAt, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
    List<UsersStatisticsDTO> getDailyAdd(@Param("createAt") String createAt, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);

    Map<String, Long> getActive(@Param("lastLoginTime") String lastLoginTime, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);
    List<UsersStatisticsDTO> getActive(@Param("lastLoginTime") String lastLoginTime, @Param("id") Long streetId, @Param("areaCode") Long areaCode, @Param("appId") String appId);


    List<StreetVOS> selectStreetByAreaCode(Integer code);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dtos/UsersStatisticsDTO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.service_user.model.dtos;

import lombok.Data;

/**
 * @ClassName: UsersStatisticsDTO
 * @Author: yh
 * @Date: 2022/10/17 10:26
 * @Description: 对登录人数和新增人数进行统计
 * com.panzhihua.service_user.model.dtos.UsersStatisticsDTO
 */
@Data
public class UsersStatisticsDTO {


    /**
     * 年月日
     */
    private String specificDate;

    /**
     * 总数
     */
    private String total;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -17,6 +17,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -101,6 +102,7 @@
import com.panzhihua.service_user.model.dos.SysUserNoticeDO;
import com.panzhihua.service_user.model.dos.SysUserRoleDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.model.dtos.UsersStatisticsDTO;
import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService;
import com.panzhihua.service_user.service.UserService;

@@ -551,7 +553,7 @@
        LambdaQueryWrapper<SysUserDO> queryWrapper = new LambdaQueryWrapper<>();
        List<ActivityManagerVO> activityManagerVOS = new ArrayList<>();
        queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId)
            .eq(SysUserDO::getStatus, 1).eq(SysUserDO::getType, 3);
                .eq(SysUserDO::getStatus, 1).eq(SysUserDO::getType, 3);
        if (!ObjectUtils.isEmpty(param)) {
            queryWrapper = queryWrapper.eq(SysUserDO::getName, param);
        }
@@ -1579,6 +1581,11 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        //因操作日志数据量太大，如果没有时间查询条件，默认查询最近十五天的数据
        if (StrUtil.isEmpty(sysOperLogVO.getStartTime()) && StrUtil.isEmpty(sysOperLogVO.getEndTime())){
            sysOperLogVO.setStartTime(com.panzhihua.common.utlis.DateUtils.getBeforeDay(15));
            sysOperLogVO.setEndTime(com.panzhihua.common.utlis.DateUtils.getCurrentDateymd());
        }
        IPage<SysOperLogVO> iPage = sysOperLogDAO.pageOperLog(page, sysOperLogVO);
        return R.ok(iPage);
    }
@@ -3557,15 +3564,18 @@
                activeDate = getMonthTwentyDays();
            }
        }

        //获取最近活跃人数
        Map<String, Long> active = userDao.getActive(activeX, streetId, areaCode, appId);
        List<UsersStatisticsDTO> actives = userDao.getActive(activeX, streetId, areaCode, appId);
        //获取最近注册人数
        Map<String, Long> dailyAdd = userDao.getDailyAdd(activeX, streetId, areaCode, appId);
        List<UsersStatisticsDTO> dailyAdds = userDao.getDailyAdd(activeX, streetId, areaCode, appId);
        Map<String, String> activeMap = actives.stream().collect(Collectors.toMap(UsersStatisticsDTO::getSpecificDate, UsersStatisticsDTO::getTotal));
        Map<String, String> dailyAddMap = dailyAdds.stream().collect(Collectors.toMap(UsersStatisticsDTO::getSpecificDate, UsersStatisticsDTO::getTotal));


        for (Date date : activeDate) {
            String dateStr = DateUtil.format(date, "yyyy-MM-dd");
            activeY.add(active.containsKey(dateStr) ? active.get("activeUser").toString() : "0");
            adY.add(dailyAdd.containsKey(dateStr) ? dailyAdd.get("addUser").toString() : "0");
            activeY.add(activeMap.containsKey(dateStr) ? activeMap.get(dateStr) : "0");
            adY.add(dailyAddMap.containsKey(dateStr) ? dailyAddMap.get(dateStr) : "0");

        }
        vo.setUserX(getMAndD(activeDate));

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysOperLogDAO.xml

@@ -28,7 +28,13 @@


    <select id="pageOperLog" resultType="com.panzhihua.common.model.vos.user.SysOperLogVO">
        select * from sys_oper_log where 1=1 <if test="sysOperLogVO.communityId != null">and community_id = #{sysOperLogVO.communityId}</if> <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if> order by oper_time desc
        select * from sys_oper_log
        where 1=1
            <if test="sysOperLogVO.communityId != null">and community_id = #{sysOperLogVO.communityId}</if>
            <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if>
            <if test="sysOperLogVO.startTime !=null"> and oper_Time &gt;= #{sysOperLogVO.startTime} </if>
            <if test="sysOperLogVO.endTime !=null"> and oper_Time &lt;= #{sysOperLogVO.endTime} </if>
        order by oper_time desc
    </select>



 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -709,8 +709,8 @@
        </if>
    </select>

    <select id="getDailyAdd" resultType="java.util.Map">
        SELECT DATE_FORMAT( su.create_at, '%Y-%m-%d' ) as createAt ,count(su.user_id) as addUser      FROM
    <select id="getDailyAdd" resultType="com.panzhihua.service_user.model.dtos.UsersStatisticsDTO">
        SELECT DATE_FORMAT( su.create_at, '%Y-%m-%d' ) as specificDate ,count(su.user_id) as total      FROM
        sys_user AS su
        LEFT JOIN com_act AS ac ON su.community_id = ac.community_id
        LEFT JOIN com_street AS cs ON ac.street_id = cs.street_id
@@ -726,10 +726,10 @@
        <if test="areaCode != null">
            and cs.area_code=#{areaCode}
        </if>
        AND su.create_at > #{createAt} GROUP BY createAt
        AND su.create_at > #{createAt} GROUP BY specificDate
    </select>
    <select id="getActive" resultType="java.util.Map">
        SELECT DATE_FORMAT( su.last_login_time, '%Y-%m-%d' ) as createAt ,count(su.user_id) as activeUser      FROM
    <select id="getActive" resultType="com.panzhihua.service_user.model.dtos.UsersStatisticsDTO">
        SELECT DATE_FORMAT( su.last_login_time, '%Y-%m-%d' ) as specificDate ,count(su.user_id) as total      FROM
        sys_user AS su
        LEFT JOIN com_act AS ac ON su.community_id = ac.community_id
        LEFT JOIN com_street AS cs ON ac.street_id = cs.street_id
@@ -745,7 +745,7 @@
        <if test="areaCode != null">
            and cs.area_code=#{areaCode}
        </if>
        AND su.last_login_time > #{lastLoginTime} GROUP BY createAt
        AND su.last_login_time > #{lastLoginTime} GROUP BY specificDate
    </select>

    <select id="selectStreetByAreaCode" resultType="com.panzhihua.common.model.vos.user.StreetVOS">