bug修复，督导开发

2247aaeb · 黄森林 · a35cafb4 · 2247aaeb · 2247aaeb · 2247aaeb
Commit 2247aaeb authored Mar 20, 2020 by 黄森林
6 changed files
--- a/common/src/main/java/com/winsun/constant/FilePath.java
+++ b/common/src/main/java/com/winsun/constant/FilePath.java
@@ -12,7 +12,7 @@ import java.util.Map;
 public enum FilePath {
    //
    BACKGROUNDIMG("套餐背景图片基础路径","enclosure"),
-    IDCARD("身份证明","enclosure/images/idCard/");
+    PATH("一人一码基础路径","enclosure/images/");
    FilePath(String id, String value) {
        this.id = id;
        this.value = value;

--- a/common/src/main/java/com/winsun/mapper/OrderMapper.java
+++ b/common/src/main/java/com/winsun/mapper/OrderMapper.java
@@ -4,10 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
@@ -19,6 +16,10 @@ import com.winsun.bean.OrderView;
 @Component
 public interface OrderMapper extends BaseMapper<Order> {
+    @Insert("insert into `hhr_order_history` values(#{id},#{status},#{date},#{operator}) ")
+    Integer inserOrderHis(@Param("id") String id, @Param("status") String status, @Param("date") Date date, @Param("operator") String operator);
    @Select("<script>SELECT * FROM `hhr_order` <where> ${ew.sqlSegment} </where> </script>")
    List<Map<String, Object>> downloadOrder(@Param("ew") Wrapper<Order> wrapper);

--- a/common/src/main/java/com/winsun/utils/PicturesUtil.java
+++ b/common/src/main/java/com/winsun/utils/PicturesUtil.java
@@ -24,14 +24,14 @@ public class PicturesUtil {
     * 前端传来图片必须为jpeg格式
     *
     * @param file 图片base64字符串
-     * @param path 图片文件夹名
+     * @param path 图片上一级文件夹名
+     * @param pathType 图片上一级文件夹名
     * @param replace 服务器更换路径
+     * @param
     * @return
     */
-    public static String uploadPictures(String file, String path,String replace){
+    public static String uploadPictures(String file, String path,String pathType,String replace){
        Date date = new Date();
-        SimpleDateFormat yyMM = new SimpleDateFormat("yyMM");
-        String y = yyMM.format(date.getTime());
        SimpleDateFormat yyMMdd = new SimpleDateFormat("yyMMdd");
        String h = yyMMdd.format(date.getTime());
        String filePath = null;
@@ -40,12 +40,12 @@ public class PicturesUtil {
            if (!multipartFiles[i].isEmpty()) {
                String base64Data = multipartFiles[i].split(",")[1];
                String houzhui = multipartFiles[i].split(",")[0].split("/")[1].split(";")[0];
-                String  filePath1 = FilePath.IDCARD.getValue() + y + "/" + h + "/" + path;
+                String  filePath1 = FilePath.PATH.getValue()+ pathType+ "/"  + h + "/" + path;
                File dir = new File(filePath1);
                if (!dir.exists()) {
                    dir.mkdirs();
                }
-                filePath = FilePath.IDCARD.getValue() + y + "/" + h + "/" + path + "/" + date.getTime() + "." + houzhui;
+                filePath = FilePath.PATH.getValue()+ pathType+ "/"+ h + "/" + path + "/" + date.getTime() + "." + houzhui;
                //byte[] bytes = Base64.getUrlDecoder().decode(base64Data);
                //byte[] bytes =new BASE64Decoder().decodeBuffer(base64Data);

--- a/new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
+++ b/new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
@@ -40,6 +40,8 @@ import java.util.*;
 public class PackageNewClothes {
    private static String REPLACE="new/ciop";
+    private static String PATHTYPE="idCard";
    private static AppMapper appMapper;
    private static PackageMapper packageMapper;
@@ -190,10 +192,10 @@ public class PackageNewClothes {
        order.setPackageId(cardId);
        order.setCustomerName(customerName);
        order.setContactNumber(contactNumber);
-        order.setStudenCard(PicturesUtil.uploadPictures(studentCard, partner,REPLACE));
+        order.setStudenCard(PicturesUtil.uploadPictures(studentCard, partner,PATHTYPE,REPLACE));
-        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner,REPLACE));
+        order.setIdCardzs(PicturesUtil.uploadPictures(studentCard, partner,PATHTYPE,REPLACE));
-        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,REPLACE));
+        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,PATHTYPE,REPLACE));
-        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,REPLACE));
+        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,PATHTYPE,REPLACE));
        order.setRemarks(remarks);
        Date date = new Date();
        order.setCreateTime(date);
@@ -292,9 +294,9 @@ public class PackageNewClothes {
        order.setCustomerName(customerName);
        order.setContactNumber(contactNumber);
        //图片处理
-        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner,REPLACE));
+        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner,PATHTYPE,REPLACE));
-        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,REPLACE));
+        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,PATHTYPE,REPLACE));
-        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,REPLACE));
+        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,PATHTYPE,REPLACE));
        order.setRemarks(remarks);
        order.setClassNumber(classNumber);
        order.setParentName(parentName);
@@ -418,7 +420,7 @@ public class PackageNewClothes {
        order.setCustomerName(customerName);
        order.setContactNumber(contactNumber);
        order.setRemarks(remarks);
-        order.setStudenCard(PicturesUtil.uploadPictures(studentCard,partner,REPLACE));
+        order.setStudenCard(PicturesUtil.uploadPictures(studentCard,partner,PATHTYPE,REPLACE));
        order.setBusinessNumber(businessNumber);
        Date date = new Date();
        order.setCreateTime(date);

--- a/service-manager/src/main/java/com/winsun/controller/QRCodeController.java
+++ b/service-manager/src/main/java/com/winsun/controller/QRCodeController.java
@@ -34,6 +34,8 @@ import java.util.*;
 @RequestMapping("QRCpde")
 public class QRCodeController extends BaseController {
+    private static String PATHTYPE="poster";
    private static String REPLACEPC="manager/ciop";
    private static QRCodeMapper qrCodeMapper;
@@ -50,7 +52,7 @@ public class QRCodeController extends BaseController {
    public ResponseData<String> uploadPicture(@RequestParam("picture") String picture) {
        ShiroUser user = getShiroUser();
        Integer userId=user.getId();
-        String path = PicturesUtil.uploadPictures(picture, userId.toString(),REPLACEPC);
+        String path = PicturesUtil.uploadPictures(picture, userId.toString(),PATHTYPE,REPLACEPC);
        QRCode qrCode = new QRCode();
        qrCode.setId(UUID.randomUUID().toString());
        qrCode.setCreateTime(new Date());

--- a/service-manager/src/main/java/com/winsun/controller/supervisorController.java
+++ b/service-manager/src/main/java/com/winsun/controller/supervisorController.java
 package com.winsun.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsun.auth.core.base.controller.BaseController;
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.auth.core.shiro.ShiroUser;
+import com.winsun.bean.Order;
+import com.winsun.bean.Package;
+import com.winsun.mapper.OrderMapper;
+import com.winsun.mapper.PackageMapper;
+import com.winsun.utils.MyBatisPlusUpdateUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
 * @Author: 张宸
 * @Date: 2020年3月11日15:12:46
@@ -15,5 +33,80 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/supervisor")
 public class supervisorController extends BaseController {
+    private static PackageMapper packageMapper;
+    private static OrderMapper orderMapper;
+    @Autowired
+    public supervisorController(PackageMapper packageMapper, OrderMapper orderMapper) {
+        supervisorController.packageMapper = packageMapper;
+        supervisorController.orderMapper = orderMapper;
+    }
+    /**
+     * 督导订单详情查询
+     *
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "selectOrderInfo", method = RequestMethod.POST)
+    public ResponseData<Map<String, Object>> selectOrderInfo(String orderId) {
+       /* ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }*/
+        Wrapper<Order> wrapper = new EntityWrapper<>();
+        wrapper.eq("id", orderId);
+        List<Map<String, Object>> list = orderMapper.selectMaps(wrapper);
+        Map<String, Object> map = list.get(0);
+        if (map.size() == 0) {
+            return ResponseData.error("当前订单不存在！");
+        }
+        Package aPackage = packageMapper.selectById(Integer.parseInt(map.get("packageId").toString()));
+        map.put("packageName", aPackage.getPackageName());
+        map.put("advImg", aPackage.getAdvImg());
+        //测试用
+        if (StringUtils.isBlank(map.get("idCard").toString())) {
+            map.put("idCard", "000000000000000000".substring(0, 14) + "****");
+        } else {
+            if (map.get("idCard").toString().length() == 18) {
+                map.put("idCard", map.get("idCard").toString().substring(0, 14) + "****");
+            } else {
+                map.put("idCard", map.get("idCard").toString().substring(0, 11) + "****");
+            }
+        }
+        map.put("explains", aPackage.getExplains());
+        //查询历史状态
+        List<Map<String, Object>> orderHis = orderMapper.selectOrderHis(orderId);
+        map.put("orderHis", orderHis);
+        return ResponseData.success(map);
+    }
+    /**
+     * 督导订单置为异常单
+     *
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "updateOrderState", method = RequestMethod.POST)
+    public ResponseData<String> updateOrderState(String orderId) {
+        /* ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }*/
+        Wrapper wrapper = new EntityWrapper<>();
+        wrapper.eq("id",orderId);
+        Map<String, Object> dataMapping = new HashMap<>();
+        dataMapping.put("order_status", "异常单");
+        Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
+        if(integer == 0){
+            return  ResponseData.error("置为异常单失败！");
+        }else {
+            //orderMapper.inserOrderHis(orderId,"已置为异常单",new Date(),user.getName());
+            orderMapper.inserOrderHis(orderId,"已置为异常单",new Date(),"测试");
+            return ResponseData.success("置为异常单成功！");
+        }
+    }
 }