bug修复，一人一码优化

common/src/main/java/com/winsun/bean/ExportExcel.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: chancy
+ * @Date: 2020/3/24 17:47
+ */
+@Data
+@TableName("hhr_export_excel")
+public class ExportExcel {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private int id;
+
+    /**
+     * 创建者
+     */
+    private int createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 导出地址
+     */
+    private String exportUrl;
+
+
+}

common/src/main/java/com/winsun/mapper/SchoolMapper.java

@@ -17,4 +17,7 @@ public interface SchoolMapper extends BaseMapper<School> {
 
     @Select("  select * from hhr_school  where id  in( select school_id from hhr_user_school where  user_id= #{userId} )")
     List<Map<String,Object>> getuserToSchool(@Param("userId")String userId);
+
+    @Select("select school_id schoolId from `hhr_user_school` where  user_id = #{partner}")
+    String selectSchoolIdByUserId(String partner);
 }

common/src/main/java/com/winsun/utils/PicturesUtil.java

@@ -26,11 +26,10 @@ public class PicturesUtil {
      * @param file 图片base64字符串
      * @param path 图片上一级文件夹名
      * @param pathType 图片上一级文件夹名
-     * @param replace 服务器更换路径
      * @param
      * @return
      */
-    public static String uploadPictures(String file, String path,String pathType,String replace){
+    public static String uploadPictures(String file, String path,String pathType){
         Date date = new Date();
         SimpleDateFormat yyMMdd = new SimpleDateFormat("yyMMdd");
         String h = yyMMdd.format(date.getTime());
@@ -70,7 +69,7 @@ public class PicturesUtil {
                 }
             }
         }
-        String enclosure = filePath.replace("enclosure", replace);
+        String enclosure = filePath.replace("enclosure", "manager/ciop");
         return enclosure;
     }
 

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -38,7 +38,6 @@ import java.util.*;
 @RestController
 @RequestMapping("/packageNewClothes")
 public class PackageNewClothes {
-    private static String REPLACE="new/ciop";
 
     private static String PATHTYPE="idCard";
 
@@ -192,10 +191,10 @@ public class PackageNewClothes {
         order.setPackageId(cardId);
         order.setCustomerName(customerName);
         order.setContactNumber(contactNumber);
-        order.setStudenCard(PicturesUtil.uploadPictures(studentCard, partner,PATHTYPE,REPLACE));
-        order.setIdCardzs(PicturesUtil.uploadPictures(studentCard, partner,PATHTYPE,REPLACE));
-        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,PATHTYPE,REPLACE));
-        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,PATHTYPE,REPLACE));
+        order.setStudenCard(PicturesUtil.uploadPictures(studentCard, partner,PATHTYPE));
+        order.setIdCardzs(PicturesUtil.uploadPictures(studentCard, partner,PATHTYPE));
+        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,PATHTYPE));
+        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,PATHTYPE));
         order.setRemarks(remarks);
         Date date = new Date();
         order.setCreateTime(date);
@@ -294,9 +293,9 @@ public class PackageNewClothes {
         order.setCustomerName(customerName);
         order.setContactNumber(contactNumber);
         //图片处理
-        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner,PATHTYPE,REPLACE));
-        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,PATHTYPE,REPLACE));
-        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,PATHTYPE,REPLACE));
+        order.setIdCardzs(PicturesUtil.uploadPictures(idCardzs, partner,PATHTYPE));
+        order.setIdCardz(PicturesUtil.uploadPictures(idCardz, partner,PATHTYPE));
+        order.setIdCardf(PicturesUtil.uploadPictures(idCardf, partner,PATHTYPE));
         order.setRemarks(remarks);
         order.setClassNumber(classNumber);
         order.setParentName(parentName);
@@ -419,7 +418,7 @@ public class PackageNewClothes {
         order.setCustomerName(customerName);
         order.setContactNumber(contactNumber);
         order.setRemarks(remarks);
-        order.setStudenCard(PicturesUtil.uploadPictures(studentCard,partner,PATHTYPE,REPLACE));
+        order.setStudenCard(PicturesUtil.uploadPictures(studentCard,partner,PATHTYPE));
         order.setBusinessNumber(businessNumber);
         Date date = new Date();
         order.setCreateTime(date);

service-manager/src/main/java/com/winsun/controller/QRCodeController.java

@@ -36,8 +36,6 @@ public class QRCodeController extends BaseController {
 
     private static String PATHTYPE="poster";
 
-    private static String REPLACEPC="manager/ciop";
-
     private static QRCodeMapper qrCodeMapper;
 
     private static SysUserMapper sysUserMapper;
@@ -52,7 +50,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(),PATHTYPE,REPLACEPC);
+        String path = PicturesUtil.uploadPictures(picture, userId.toString(),PATHTYPE);
         QRCode qrCode = new QRCode();
         qrCode.setId(UUID.randomUUID().toString());
         qrCode.setCreateTime(new Date());

service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java

@@ -236,19 +236,14 @@ public class SchoolManagementController extends BaseController {
 
     @Permission(menuname = "上传二维码", value = "qrcodeUpload", method = RequestMethod.POST)
     public ResponseData<String>xiaotuUpload(@RequestParam(value = "file") MultipartFile file, @RequestParam(value = "id",required = false) String id) {
-
-        String  backgroundpath= FilePath.BACKGROUNDIMG.getValue()+"/"+DEFAULTPATH+"/";
-
-        if (StringUtils.isBlank(id)){
-            EntityWrapper<School> packagewrapper = new EntityWrapper<>();
-            packagewrapper.setSqlSelect("max(id) as id");
-            List<Map<String, Object>> selectMaps = schoolMapper.selectMaps(packagewrapper);
-            id = selectMaps.get(0).get("id").toString();
-            id = Integer.valueOf(Integer.valueOf(id)+1).toString();
-        }
-
+        String  backgroundpath= FilePath.BACKGROUNDIMG.getValue()+"/"+DEFAULTPATH;
         boolean makefile = FileUtil.makefile(backgroundpath, file,id+FILENAME);
-        if (!makefile){
+        Wrapper<School> wrapper = new EntityWrapper<>();
+        wrapper.eq("id",id);
+        Map<String, Object> map = new HashMap<>();
+        map.put("service_qrcode",backgroundpath+id+FILENAME);
+        Integer integer = schoolMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(map), wrapper);
+        if (integer!=1){
             return ResponseData.error("上传失败！");
         }
         return ResponseData.success("上传成功" );