chore:补充提交

jinpengyong

2023-10-19 c8324bcbb8adb726c7aad1394045cf61383955b8

chore:补充提交

 screen-api/src/main/java/com/moral/api/controller/AllocationController.java

@@ -200,30 +200,4 @@



    @GetMapping("selectSmallRoutine")
    @ApiOperation("小程序查询")
    public ResultMessage selectSmallRoutine(@RequestParam @ApiParam(value = "state",name = "状态") Integer state,
                                            @RequestParam @ApiParam(value = "startTime",name = "开始时间") String startTime,
                                            @RequestParam @ApiParam(value = "endTime",name = "结束时间") String endTime){
        List<AllocationFindVo> allocationFindVos = allocationService.selectSmallRoutine(state,startTime,endTime);
        return ResultMessage.ok(ObjectUtils.isEmpty(allocationFindVos)? "0":allocationFindVos);
    }


    @PostMapping("changeRoutine")
    @ApiOperation("小程序整改")
    public ResultMessage changeSmallRoutine(@Valid @RequestBody AllocationChangeCond changeCond){
        allocationService.changeSmallRoutine(changeCond);
        return ResultMessage.ok();
    }


    @PostMapping("checkRoutine")
    @ApiOperation("小程序审批")
    public ResultMessage checkSmallRoutine(@Valid @RequestBody AllocationCheckCond checkCond){
        allocationService.checkSmallRoutine(checkCond);
        return ResultMessage.ok();
    }


}

 screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java

New file
@@ -0,0 +1,63 @@
package com.moral.api.controller;


import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

import javax.validation.Valid;

import com.moral.api.pojo.query.allocation.AllocationChangeCond;
import com.moral.api.pojo.query.allocation.AllocationCheckCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;
import com.moral.api.service.AllocationService;
import com.moral.constant.ResultMessage;

@Api(tags = {"小程序立行立改"})
@RestController
@RequestMapping("allocationApp")
public class AppAllocationController {



    @Autowired
    private AllocationService allocationService;



    @GetMapping("select")
    @ApiOperation("小程序查询")
    public ResultMessage selectSmallRoutine(@RequestParam @ApiParam(value = "state",name = "状态") Integer state,
                                            @RequestParam @ApiParam(value = "startTime",name = "开始时间") String startTime,
                                            @RequestParam @ApiParam(value = "endTime",name = "结束时间") String endTime){
        List<AllocationFindVo> allocationFindVos = allocationService.selectSmallRoutine(state,startTime,endTime);
        return ResultMessage.ok(ObjectUtils.isEmpty(allocationFindVos)? "0":allocationFindVos);
    }


    @PostMapping("changeRoutine")
    @ApiOperation("小程序整改")
    public ResultMessage changeSmallRoutine(@Valid @RequestBody AllocationChangeCond changeCond){
        allocationService.changeSmallRoutine(changeCond);
        return ResultMessage.ok();
    }


    @PostMapping("checkRoutine")
    @ApiOperation("小程序审批")
    public ResultMessage checkSmallRoutine(@Valid @RequestBody AllocationCheckCond checkCond){
        allocationService.checkSmallRoutine(checkCond);
        return ResultMessage.ok();
    }

}

 screen-api/src/main/java/com/moral/api/controller/AppUserController.java

New file
@@ -0,0 +1,98 @@
package com.moral.api.controller;


import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.moral.api.entity.AppUser;
import com.moral.api.exception.BusinessException;
import com.moral.api.mapper.AppUserMapper;
import com.moral.api.service.UserService;
import com.moral.api.utils.WechatUtils;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;

@Slf4j
@Api(tags = {"小程序用户管理"})
@RestController
@RequestMapping("/AppUser")
public class AppUserController {

    @Autowired
    private UserService userService;

    @Autowired
    private AppUserMapper appUserMapper;

    @ApiOperation(value = "登陆信息", notes = "登陆信息")
    @PostMapping("login")
    public ResultMessage login(@RequestBody Map<String, Object> parameters) {
        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> result = userService.loginSmallRoutine(parameters);
        if (!result.containsKey("token")) {
            return ResultMessage.fail((int) result.get("code"), (String) result.get("msg"));
        }
        return ResultMessage.ok(result);
    }


    @PostMapping("/wx/login")
    @ApiOperation(value = "小程序登陆", notes = "小程序登陆")
    public ResultMessage userLogin(@RequestParam(value = "code", required = false) String code,
                        @RequestParam(value = "rawData", required = false) String rawData,
                        @RequestParam(value = "signature", required = false) String signature) {
        // 用户非敏感信息：rawData
        // 签名：signature
        JSONObject rawDataJson = JSON.parseObject(rawData);
        // 1.接收小程序发送的code
        // 2.开发者服务器 登录凭证校验接口 appi + appsecret + code
        JSONObject SessionKeyOpenId = WechatUtils.getSessionKeyOrOpenId(code);
        // 3.接收微信接口服务 获取返回的参数
        String openid = SessionKeyOpenId.getString("openid");
        String sessionKey = SessionKeyOpenId.getString("session_key");

        // 4.校验签名 小程序发送的签名signature与服务器端生成的签名signature2 = sha1(rawData + sessionKey)
        String signature2 = DigestUtils.sha1Hex(rawData + sessionKey);
        if (!signature.equals(signature2)) {
//            return ResultMessage.ok().message("签名校验失败");
//            return ResultMessage.ok("签名校验失败");
            throw new BusinessException("签名校验失败");
        }
        // 5.根据返回的User实体类，判断用户是否是新用户，是的话，将用户信息存到数据库；
        LambdaQueryWrapper<AppUser> lqw = Wrappers.lambdaQuery();
        lqw.eq(AppUser::getOpenId, openid);
//        User user = userService.getOne(lqw);
        AppUser user = appUserMapper.selectOne(lqw);

        if (user == null) {
            // 用户信息入库
            String nickName = rawDataJson.getString("nickName");
            String avatarUrl = rawDataJson.getString("avatarUrl");
            user = new AppUser();
            user.setOpenId(Integer.parseInt(openid));
            user.setAvatarUrl(avatarUrl);
            user.setNickName(nickName);
            appUserMapper.insert(user);
        }
        return ResultMessage.ok(user);
    }


}

 screen-api/src/main/java/com/moral/api/controller/UserSmallRoutineController.java

File was deleted

 screen-api/src/main/java/com/moral/api/entity/AppUser.java

New file
@@ -0,0 +1,18 @@
package com.moral.api.entity;


import lombok.Data;

import com.baomidou.mybatisplus.extension.activerecord.Model;

@Data
public class AppUser extends Model<AppUser>  {

    private Integer openId;

    private String  account;

    private String nickName;

    private String avatarUrl;
}

 screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java

@@ -33,6 +33,6 @@
    List<AllocationListExt> extList(@Param("allocation") AllocationListCond allocationListCond);


    List<AllocationFindVo> selectSmallRoutine( Integer state);


}

 screen-api/src/main/java/com/moral/api/mapper/AppUserMapper.java

New file
@@ -0,0 +1,8 @@
package com.moral.api.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.AppUser;


public interface AppUserMapper extends BaseMapper<AppUser> {
}

 screen-api/src/main/java/com/moral/api/mapper/UserSmallRoutineMapper.java

File was deleted

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -640,7 +640,7 @@
    public List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime) {
        ArrayList<AllocationFindVo> allocationFindVos = new ArrayList<>();
        LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();

        wrapper.orderByDesc(Allocation::getEscalationTime);
        //获取用户信息
        List<Integer> list = unitResult();
        if (!ObjectUtils.isEmpty(list)){
@@ -679,9 +679,12 @@
        for (Allocation allocation : allocations) {
            AllocationFindVo allocationFindVo = new AllocationFindVo();
            BeanUtils.copyProperties(allocation,allocationFindVo);
            if (integer==0 || integer==1){

            }
            allocationFindVos.add(allocationFindVo);
        }
//        List<AllocationFindVo> allocationFindVos = allocationMapper.selectSmallRoutine(state);
        List<AllocationFindVo> allocationFindVo = allocationMapper.selectSmallRoutine(state,startTime,endTime);
        return allocationFindVos;
    }

@@ -694,8 +697,8 @@
    @Transactional
    public void changeSmallRoutine(AllocationChangeCond changeCond) {
        Integer integer = unitAreaCode();
        if (integer==1){
            throw new BusinessException("此账户只能审批，不能整改！");
        if (integer==2){
            throw new BusinessException("此账户只能审核，不能整改！");
        }
        AllocationExt allocationExt = oneAllocation(changeCond.getAllocationId());
        if(!AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {

 screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java

@@ -20,6 +20,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;

 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -80,6 +80,9 @@
    @Autowired
    private OperationLogUtils operationLogUtils;

    @Autowired
    private ResponsibilityUnitMapper responsibilityUnitMapper;


    @Value("${AES.KEY}")
    private String AESKey;
@@ -120,6 +123,7 @@
            result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
            return result;
        }
        ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
        //封装用户信息
        Map<String, Object> userInfo = new LinkedHashMap<>();
        userInfo.put("userId", userBo.getId());
@@ -128,6 +132,7 @@
        userInfo.put("email", userBo.getEmail());
        userInfo.put("mobile", userBo.getMobile());
        userInfo.put("unitId",userBo.getUnitId());
        userInfo.put("unName",responsibilityUnit.getAreaName());
        userInfo.put("wechat", userBo.getWechat());
        userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
        userInfo.put("isAdmin", userBo.getIsAdmin());
@@ -184,9 +189,10 @@
            result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
            return result;
        }

        //封装用户信息
        Map<String, Object> userInfo = new LinkedHashMap<>();

        ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
        //用户信息
        userInfo.put("userId", userBo.getId());
        userInfo.put("account", userBo.getAccount());
@@ -194,6 +200,7 @@
        userInfo.put("email", userBo.getEmail());
        userInfo.put("mobile", userBo.getMobile());
        userInfo.put("unitId",userBo.getUnitId());
        userInfo.put("unName",responsibilityUnit.getAreaName());
        userInfo.put("wechat", userBo.getWechat());
        userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
        userInfo.put("isAdmin", userBo.getIsAdmin());

 screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java

New file
@@ -0,0 +1,136 @@
package com.moral.api.utils;

import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;

import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;

import java.util.List;
import java.util.Map;

public class HttpClientUtil {



    public static String doGet(String url, Map<String, String> param) {

        // 创建Httpclient对象
        CloseableHttpClient httpclient = HttpClients.createDefault();

        String resultString = "";
        CloseableHttpResponse response = null;
        try {
            // 创建uri
            URIBuilder builder = new URIBuilder(url);
            if (param != null) {
                for (String key : param.keySet()) {
                    builder.addParameter(key, param.get(key));
                }
            }
            URI uri = builder.build();

            // 创建http GET请求
            HttpGet httpGet = new HttpGet(uri);

            // 执行请求
            response = httpclient.execute(httpGet);
            // 判断返回状态是否为200
            if (response.getStatusLine().getStatusCode() == 200) {
                resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
            }
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            try {
                if (response != null) {
                    response.close();
                }
                httpclient.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
        return resultString;
    }

    public static String doGet(String url) {
        return doGet(url, null);
    }

    public static String doPost(String url, Map<String, String> param) {
        // 创建Httpclient对象
        CloseableHttpClient httpClient = HttpClients.createDefault();
        CloseableHttpResponse response = null;
        String resultString = "";
        try {
            // 创建Http Post请求
            HttpPost httpPost = new HttpPost(url);
            // 创建参数列表
            if (param != null) {
                List<NameValuePair> paramList = new ArrayList<>();
                for (String key : param.keySet()) {
                    paramList.add(new BasicNameValuePair(key, param.get(key)));
                }
                // 模拟表单
                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList);
                httpPost.setEntity(entity);
            }
            // 执行http请求
            response = httpClient.execute(httpPost);
            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            try {
                response.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }

        return resultString;
    }

    public static String doPost(String url) {
        return doPost(url, null);
    }

    public static String doPostJson(String url, String json) {
        // 创建Httpclient对象
        CloseableHttpClient httpClient = HttpClients.createDefault();
        CloseableHttpResponse response = null;
        String resultString = "";
        try {
            // 创建Http Post请求
            HttpPost httpPost = new HttpPost(url);
            // 创建请求内容
            StringEntity entity = new StringEntity(json, ContentType.APPLICATION_JSON);
            httpPost.setEntity(entity);
            // 执行http请求
            response = httpClient.execute(httpPost);
            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            try {
                response.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }

        return resultString;
    }
}

 screen-api/src/main/java/com/moral/api/utils/WechatUtils.java

New file
@@ -0,0 +1,34 @@
package com.moral.api.utils;




import java.util.HashMap;
import java.util.Map;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;

public class WechatUtils {

    public static final String APPID = "yyyy";
    public static final String SECRET = "yyyy";


    public static JSONObject getSessionKeyOrOpenId(String code) {
        String requestUrl = "https://api.weixin.qq.com/sns/jscode2session";
        Map<String, String> requestUrlParam = new HashMap<>();
        // https://mp.weixin.qq.com/wxopen/devprofile?action=get_profile&token=164113089&lang=zh_CN
        //小程序appId
        requestUrlParam.put("appid", APPID);
        //小程序secret
        requestUrlParam.put("secret",SECRET);
        //小程序端返回的code
        requestUrlParam.put("js_code", code);
        //默认参数
        requestUrlParam.put("grant_type", "authorization_code");
        //发送post请求读取调用微信接口获取openid用户唯一标识
        JSONObject jsonObject = JSON.parseObject(HttpClientUtil.doPost(requestUrl, requestUrlParam));
        return jsonObject;
    }
}

 screen-api/src/main/resources/mapper/AllocationMapper.xml

@@ -60,25 +60,6 @@
    </select>


    <select id="selectSmallRoutine" resultType="com.moral.api.pojo.vo.allocation.AllocationFindVo">
        SELECT
        <include refid="Allocation_Column_List"/>
        FROM  allocation as a
        <where>
            and is_del = 0 and is_invalid =0
            <if test="allocation.state != null and allocation.id != 0">
                and a.state = #{state}
            </if>
            <if test="allocation.startTime != null and allocation.startTime != '' ">
                and date(escalation_time) <![CDATA[>=]]> #{startTime}
            </if>
            <if test="allocation.endTime != null and allocation.endTime !='' ">
                and date(escalation_time) <![CDATA[<=]]>  #{endTime}
            </if>
        </where>
        order by escalation_time desc,allocation_id desc
    </select>

    <select id="extPage" resultType="com.moral.api.pojo.ext.allocation.AllocationPageExt">
        SELECT
        <include refid="Allocation_Column_List"/>,t1.id as applyState