Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-19 e94a80ae3d9733eb2d6a5d9bcbd50a624f058caa

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

@@ -42,14 +42,15 @@
    @GetMapping("/getlist")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "keyword",required = false) String keyword)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword);

        int num=IUserService.selectNum("2");
        int num=IUserService.selectNum("2",keyword);
        return getDataTable(list,num);
    }

@@ -97,11 +98,10 @@
        SysUser user=IUserService.selectData(null,config.getPhonenumber());
        if (user != null)
        {
            config.setId(user.getId());
            //提示用户名或密码错误
            return toAjax(IUserService.updateConfig(config));
            return ResultData.error("该手机号已注册账户！请更换");
        }

        config.setRoleIds(2+"");
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId());
@@ -197,7 +197,8 @@
    @GetMapping("/selectListByDepartmentId")
    @Authorization
    public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
                                               @RequestParam(value = "classifyId",required = false) String classifyId){
                                               @RequestParam(value = "classifyId",required = false) String classifyId)
    {
        return  ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
    }


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

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.RoleManagementEntity;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IRoleManagementService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -33,7 +35,8 @@
    @GetMapping("/getList")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "name",required = false) String name)
    {
        if(pageNum==null)
        {
@@ -46,9 +49,9 @@
        }

        Page<RoleManagementEntity> pageParam = new Page<>(pageNum,pageSize);
        List<RoleManagementEntity> list = iRoleManagementService.selectConfigList(pageParam,pageSize);
        List<RoleManagementEntity> list = iRoleManagementService.selectConfigList(pageParam,pageSize,name);

        int num=iRoleManagementService.countNum();
        int num=iRoleManagementService.countNum(name);
        return getDataTable(list,num);
    }

@@ -60,9 +63,9 @@
    @ApiOperation("新增角色")
    @PostMapping("/add")
    @Authorization
    public ResultData insertConfig(@RequestBody RoleManagementEntity entity)
    public ResultData insertConfig(@RequestBody RoleManagementEntity entity, @CurrentUser SysUser sysUser)
    {
//        entity.setCreateUserId(sysUser.getUserId()+"");
        entity.setCreateUserId(sysUser.getUserId()+"");
        return toAjax(iRoleManagementService.insertConfig(entity));
    }


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

@@ -239,4 +239,32 @@
    }


    /**
     * 办事指南复制
     * @return
     */
    @ApiOperation(value = "办事指南复制",response = ResultData.class)
    @GetMapping("/copy")
    public ResultData copy(@RequestParam("Id") String Id)
    {
        if(StringUtils.isEmpty(Id))
        {
            return ResultData.error("Id不能为空");
        }

        TransactionEvent transactionEvent=iTransactionEventService.selectConfigData(Id,null);
        if(transactionEvent==null)
        {
            return ResultData.error("复制项不存在");
        }
        transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");

        transactionEvent.setId(null);
        return toAjax(iTransactionEventService.insertConfig(transactionEvent));
    }





}

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

@@ -170,14 +170,15 @@
    @GetMapping("/getlist")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "keyword",required = false) String keyword)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);

        int num=IUserService.selectNum("3");
        int num=IUserService.selectNum("3",keyword);
        return getDataTable(list,num);
    }


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

@@ -1,6 +1,7 @@
package com.dg.core.db.gen.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -66,6 +67,10 @@
    @ApiModelProperty("权限")
    private String permission;

    @TableField(exist = false)
    @ApiModelProperty("创建者名称")
    private String createName;



}

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

@@ -96,15 +96,15 @@
    private String basicInformation;

    /**
     * 受理条件
     * 现场申报
     */
    @ApiModelProperty("受理条件")
    @ApiModelProperty("现场申报")
    private String acceptConditions;

    /**
     * 申请材料
     *  办理区域
     */
    @ApiModelProperty("申请材料")
    @ApiModelProperty("办理区域")
    private String applicationMaterial;

    /**
@@ -114,9 +114,9 @@
    private String handlingProcedures;

    /**
     * 收费标准
     * 网上申报
     */
    @ApiModelProperty("收费标准")
    @ApiModelProperty("网上申报")
    private String rates;

    /**
@@ -132,7 +132,6 @@
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;


    /**
     * 联想词内容 , 连接
@@ -151,14 +150,14 @@
    @ApiModelProperty("基础信息附件url")
    private String basicInformationUrl;
    /**
     * 受理条件附件url
     * 现场申报附件url
     */
    @ApiModelProperty("受理条件附件url")
    @ApiModelProperty("现场申报附件url")
    private String acceptConditionsUrl;
    /**
     * 申请材料附件url
     * 办理区域附件url
     */
    @ApiModelProperty("申请材料附件url")
    @ApiModelProperty("办理区域附件url")
    private String applicationMaterialUrl;
    /**
     * 办理流程附件url
@@ -166,9 +165,9 @@
    @ApiModelProperty("办理流程附件url")
    private String handlingProceduresUrl;
    /**
     * 收费标准附件url
     * 网上申报附件url
     */
    @ApiModelProperty("收费标准附件url")
    @ApiModelProperty("网上申报附件url")
    private String ratesUrl;
    /**
     * 基础信息附件url
@@ -176,14 +175,14 @@
    @ApiModelProperty("基础信息附件url")
    private String basicInformationFileName;
    /**
     * 附件url
     * 现场申报附件url
     */
    @ApiModelProperty("附件url")
    @ApiModelProperty("现场申报附件url")
    private String acceptConditionsFileName;
    /**
     * 申请材料文件名称
     * 办理区域文件名称
     */
    @ApiModelProperty("申请材料文件名称")
    @ApiModelProperty("办理区域文件名称")
    private String applicationMaterialFileName;
    /**
     * 办理流程文件名称
@@ -191,11 +190,10 @@
    @ApiModelProperty("办理流程文件名称")
    private String handlingProceduresFileName;
    /**
     * 收费标准文件名称
     * 网上申报文件名称
     */
    @ApiModelProperty("收费标准文件名称")
    @ApiModelProperty("网上申报文件名称")
    private String ratesFileName;


    /**
     * 操作指引附件url
@@ -203,14 +201,11 @@
    @ApiModelProperty("操作指引附件url")
    private String operationalGuidelineUrl;


   /**
     * 操作指引视频url
     */
    @ApiModelProperty("操作指引视频url")
    private String operationalGuidelineVideoUrl;



    /**
     * 设定依据
@@ -247,13 +242,13 @@
    private String commonProblemName;


    @ApiModelProperty("办理区域")
    @ApiModelProperty("手机移动端申报")
    private String transactionArea;

    @ApiModelProperty("办理区域url")
    @ApiModelProperty("手机移动端申报url")
    private String transactionAreaUrl;

    @ApiModelProperty("办理区域文件名称")
    @ApiModelProperty("手机移动端申报文件名称")
    private String transactionAreaName;


@@ -268,8 +263,6 @@
    @TableField(exist = false)
    @ApiModelProperty(name = "sumClassifyName", value = "分类总名称")
    String  sumClassifyName;



    @ApiModelProperty(name = "operationalGuidelineVideoName", value = "操作指南视频名称")
    private String  operationalGuidelineVideoName;

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.db.gen.entity.RoleManagementEntity;
import org.springframework.data.repository.query.Param;

import java.util.List;

@@ -17,7 +18,8 @@
     * @param state
     * @return
     */
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state);
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state,
                                                       @Param("name") String name);

    /**
     * 新增角色
@@ -44,7 +46,7 @@
     * 统计条数
     * @return
     */
    public int countNum();
    public int countNum(String name);




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

@@ -26,7 +26,9 @@
     *
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName);



@@ -63,7 +65,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(@Param("userType") String userType,@Param("userName") String userName);

    /**
     * 根据部门id及分类id获取导办用户

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

@@ -13,7 +13,8 @@
     * @param state
     * @return
     */
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state);
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page,
                                                       Integer state,String name);

    /**
     * 新增角色
@@ -40,5 +41,5 @@
     * 统计条数
     * @return
     */
    public int countNum();
    public int countNum(String name);
}

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

@@ -14,7 +14,7 @@
     *
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName);


    SysUser selectData(String userId,String phonenumber);
@@ -48,7 +48,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(String userType,String userName);

    /**
     * 发送验证码(如果没有该用户则新建用户)

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

@@ -12,8 +12,8 @@
@Service
public class RoleManagementImpl extends ServiceImpl<RoleManagementMapper, RoleManagementEntity> implements IRoleManagementService {
    @Override
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state) {
        return baseMapper.selectConfigList(page,state);
    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state,String name) {
        return baseMapper.selectConfigList(page,state,name);
    }

    @Override
@@ -32,7 +32,7 @@
    }

    @Override
    public int countNum() {
        return baseMapper.countNum();
    public int countNum(String name) {
        return baseMapper.countNum(name);
    }
}

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

@@ -240,8 +240,8 @@
    }

    @Override
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType) {
        return baseMapper.selectConfigList(page, state,userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName) {
        return baseMapper.selectConfigList(page, state,userType,userName);
    }

    @Override
@@ -284,8 +284,8 @@
    }

    @Override
    public int selectNum(String userType) {
        return baseMapper.selectNum(userType);
    public int selectNum(String userType,String userName) {
        return baseMapper.selectNum(userType,userName);
    }



 flower_city/src/main/resources/application-sms.properties

@@ -3,10 +3,11 @@
aliyun.screct=wkyvU72m6JmCFepCzGVuSpsJOsbRV0
aliyun.SignName=????
aliyun.TemplateCode=SMS_254326275
aliyun.TemplateCodeOvertime=SMS_254460011
#aliyun.TemplateCodeOvertime=SMS_254460011
aliyun.TemplateCodeOvertime=SMS_254460012
aliyun.TemplateCodeComplete=SMS_254875101
aliyun.TemplateCodeSubmit=SMS_254880764

#aliyun.TemplateCodeSubmit=SMS_254880764
aliyun.TemplateCodeSubmit=SMS_254880763




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

@@ -21,6 +21,7 @@
            create_time,
            update_time,
            create_user_id,
            (select user_name from automessage_sys_user where create_user_id=automessage_sys_user.user_id) as createName,
            update_user_id
        FROM
            automessage_role_management
@@ -28,10 +29,10 @@

    <select id="selectConfigList"  resultMap="RoleManagementEntityResult">
        <include refid="selectRoleManagementEntityVo"/>
        <!--        <where>-->
        <!--            <if test="userName != null and userName != ''">-->
        <!--                AND user_name like concat('%', #{userName}, '%')-->
        <!--            </if>-->
        <where>
            <if test="name!=null and name!=''">
                and role_name like concat('%', #{name}, '%')
            </if>
        <!--            <if test="streetName != null and streetName != ''">-->
        <!--                AND street_name like concat('%', #{streetName}, '%')-->
        <!--            </if>-->
@@ -45,7 +46,7 @@
        <!--                AND role_id=#{roleId}-->
        <!--            </if>-->

        <!--        </where>-->
        </where>

        order by create_time desc
    </select>
@@ -89,6 +90,11 @@

    <select id="countNum" resultType="integer">
        select count(id) from automessage_role_management
        <where>
            <if test="name!=null and name!=''">
                and role_name like concat('%', #{name}, '%')
            </if>
        </where>
    </select>

</mapper>

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

@@ -29,6 +29,7 @@
                and role_id=#{roleId}
            </if>


        </where>
    </select>


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

@@ -75,7 +75,13 @@
                ) AS department_area,
            leisure_state,
            master_ids,
            master_names,
            (SELECT GROUP_CONCAT(classify_name) FROM automessage_classify_administration WHERE id in (SELECT
            substring_index(substring_index(master_ids,',', b.help_topic_id + 1), ',', -1) result
            FROM
            mysql.help_topic b
            where
            b.help_topic_id &lt; (LENGTH(master_ids) - LENGTH(REPLACE(master_ids, ',', '')) + 1))) as master_names,
               
            transaction_ids,
            transaction_names,
            openid,
@@ -91,6 +97,12 @@
    <select id="selectNum" parameterType="string" resultType="integer">
        select count(user_id) from automessage_sys_user
        <where>
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
                WHERE organization_name like concat('%', #{userName}, '%'))) or
                phonenumber like concat('%', #{userName}, '%')
            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>
@@ -111,9 +123,12 @@
    <select id="selectConfigList" parameterType="string" resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
        <where>
<!--            <if test="userName != null and userName != ''">-->
<!--                AND user_name like concat('%', #{userName}, '%')-->
<!--            </if>-->
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
                WHERE organization_name like concat('%', #{userName}, '%'))) or
                phonenumber like concat('%', #{userName}, '%')
            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>

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

@@ -156,6 +156,7 @@
                AND (matter_name like concat('%', #{keyword}, '%')) or
                    (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                    or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
                    or (associate_names like concat('%', #{keyword}, '%'))
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}
@@ -325,6 +326,7 @@
                AND (matter_name like concat('%', #{keyword}, '%')) or
                (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
                or (associate_names like concat('%', #{keyword}, '%'))
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from classify_administration where classify_grade.id=classify_id) = #{classifyGrade}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java

@@ -88,6 +88,7 @@
        return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
    }


    /**
     * 删除
     * */

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

@@ -172,9 +172,9 @@
                }
            }
        }
        if (loginUserInfo.getAccount().equals("admin") || loginUserInfo.getAccount().equals("xiqu")){
        if (loginUserInfo.getAccount().equals("admin") && isNull(level)){
            id=null;
            range=null;
            range=1;
        }
        IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
        for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {

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

@@ -53,6 +53,9 @@
                OR name like concat('%',#{keyWord},'%')
                OR phone like concat('%',#{keyWord},'%')
            </if>
            <if test="level != null ">
            AND level=#{level}
            </if>
            <if test="range != null and range != ''">
                <if test="range == 3">
                  AND street_id=#{id}
@@ -63,10 +66,11 @@
                <if test="range == 2">
                  AND industry_center_id=#{id}
                </if>
                <if test="range == 1">
                    AND level=1
                </if>
            </if>
            <if test="level != null ">
                AND level=#{level}
            </if>

    </select>
    <select id="selectExpertIndustry" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(t.id) as 'count',t1.name,t1.id from com_sanshuo_expert t