1.后台取得一些接口的token 2.修改bug

fengjin

2022-09-29 55f6d26047306b579b470193fc93aa1ff4538b29

1.后台取得一些接口的token 2.修改bug

 flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java

@@ -27,7 +27,6 @@
     */
    @ApiOperation(value = "通过协议名获取相关协议",response = Agreement.class)
    @GetMapping(value = "/queryByAgreement")
    @Authorization
    public ResultData queryByAgreement(@RequestParam("agreement") String agreement) {
        return ResultData.success(agreementService.queryByAgreement(agreement));
    }

 flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java

@@ -54,7 +54,6 @@
     */
    @ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
    @GetMapping("/queryListById")
    @Authorization
    ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
        if(id==null)
            id=0;

 flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java

@@ -47,7 +47,6 @@
     */
    @ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
    @GetMapping("/selectById")
    @Authorization
    ResultData selectConfigById(@RequestParam("id") String id){
        return ResultData.success(iOrganizationChartService.selectConfigById(id));
    }

 flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java

@@ -36,7 +36,6 @@
     */
    @ApiOperation("查询导办事务详情")
    @GetMapping("/getData")
    @Authorization
    public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
    {
        Assert.notNull(Id, "Id 不能为空");
@@ -67,7 +66,6 @@
     */
    @ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
    @GetMapping("/queryKeyWord")
    @Authorization
    public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
    {
        QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
@@ -104,7 +102,6 @@
     */
    @ApiOperation(value = "智能咨询",response = RecommendResult.class)
    @GetMapping("/smartConsulting")
    @Authorization
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
        return  iTransactionEventService.smartConsulting(keyWord);


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

@@ -29,7 +29,6 @@
     */
    @ApiOperation(value = "通过协议名获取相关协议",response = Agreement.class)
    @GetMapping(value = "/queryByAgreement")
    @Authorization
    public ResultData queryByAgreement(@RequestParam("agreement") String agreement) {
        return ResultData.success(agreementService.queryByAgreement(agreement));
    }

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

@@ -136,7 +136,6 @@
     */
    @ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
    @GetMapping("/queryListById")
    @Authorization
    ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
        if(id==null)
            id=0;

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

@@ -339,7 +339,6 @@
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName);
        int num=iGuideRepairOrderService.countConfigList(matterName);
        return getDataTable(list,num);

    }



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

@@ -96,7 +96,6 @@
     */
    @ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
    @GetMapping("/selectById")
    @Authorization
    ResultData selectConfigById(@RequestParam("id") String id){
          return ResultData.success(iOrganizationChartService.selectConfigById(id));
    }

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

@@ -36,7 +36,6 @@
     */
    @ApiOperation("查询导办事务详情")
    @GetMapping("/getData")
    @Authorization
    public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
    {
        Assert.notNull(Id, "Id 不能为空");
@@ -195,7 +194,6 @@
     */
    @ApiOperation(value = "智能咨询",response = RecommendResult.class)
    @GetMapping("/smartConsulting")
    @Authorization
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
        return  iTransactionEventService.smartConsulting(keyWord);


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

@@ -13,6 +13,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.repository.query.Param;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

@@ -247,6 +248,17 @@
        return toAjax(IUserService.updateConfig(config));
    }

    /**
     * 根据部门id及分类id获取导办用户
     *
     * @return 结果
     */
    @ApiOperation("根据部门id及分类id获取导办用户")
    @GetMapping("/selectListByDepartmentId")
    public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId, @RequestParam("classifyId") String classifyId){
        return  ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
    }



}

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

@@ -59,4 +59,11 @@
     * @return 结果
     */
    public int selectNum(String userType);

    /**
     * 根据部门id及分类id获取导办用户
     *
     * @return 结果
     */
    List<SysUser> selectListByDepartmentId(@Param("departmentId") String departmentId,@Param("classifyId") String classifyId);
}

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

@@ -64,5 +64,12 @@
     */
    ResultData loginByAccount(String phonenumber, String code);

    /**
     * 根据部门id及分类id获取导办用户
     *
     * @return 结果
     */
    List<SysUser> selectListByDepartmentId(String departmentId,String classifyId);


}

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

@@ -103,6 +103,11 @@
    }

    @Override
    public List<SysUser> selectListByDepartmentId(String departmentId, String classifyId) {
        return baseMapper.selectListByDepartmentId(departmentId,classifyId);
    }

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

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

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

    <select id="selectListByDepartmentId"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
         where department_id=#{departmentId} and master_ids like concat('%',#{classifyId}, '%')
    </select>


    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
        insert into automessage_sys_user (