update

src/main/java/com/mokamrp/privates/controller/pangu/CustserviceController.java

@@ -9,6 +9,7 @@ import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.AddHandle;
 import com.mokamrp.privates.entity.DelHandle;
 import com.mokamrp.privates.entity.EditHandle;
+import com.mokamrp.privates.entity.SetGroupHandle;
 import com.mokamrp.privates.entity.pangu.CustserviceListHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.pojo.CustserviceVo;
@@ -21,6 +22,7 @@ import com.mokamrp.privates.mapper.pangu.pojo.Custservice;
 
 import javax.validation.Valid;
 import java.awt.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -111,6 +113,19 @@ public class CustserviceController extends BaseController<Custservice> {
         return AjaxResult.success(Constants.SUCCESS, true);
     }
 
+    @PostMapping("/setGroup")
+    public Object setGroup(@Valid @RequestBody SetGroupHandle setGroupHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        Custservice custservice  = new Custservice();
+        custservice.setGroupId(setGroupHandle.getGroupId());
+        custservice.setUpdateAt(LocalDateTime.now());
+        service.update(custservice,new QueryWrapper<Custservice>().in("id",setGroupHandle.getIds()));
+        this.sync();
+        return AjaxResult.success(Constants.SUCCESS,true);
+    }
+
     /**
      * 同步到redis
      * @return

src/main/java/com/mokamrp/privates/controller/pangu/PlaybillController.java

@@ -1,11 +1,17 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.Constants;
+import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
+import com.mokamrp.privates.entity.SetGroupHandle;
 import com.mokamrp.privates.entity.pangu.CustserviceListHandle;
 import com.mokamrp.privates.entity.pangu.PlaybillGroupListHandle;
 import com.mokamrp.privates.entity.pangu.PlaybillListHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pangu.pojo.Custservice;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,6 +21,7 @@ import com.mokamrp.privates.mapper.pangu.pojo.Playbill;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -44,5 +51,16 @@ public class PlaybillController extends BaseController<Playbill> {
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/setGroup")
+    public Object setGroup(@Valid @RequestBody SetGroupHandle setGroupHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        Playbill playbill  = new Playbill();
+        playbill.setGroupId(setGroupHandle.getGroupId());
+        playbill.setUpdateAt(LocalDateTime.now());
+        service.update(playbill,new QueryWrapper<Playbill>().in("id",setGroupHandle.getIds()));
+        return AjaxResult.success(Constants.SUCCESS,true);
+    }
 }
 

src/main/java/com/mokamrp/privates/entity/SetGroupHandle.java

@@ -0,0 +1,16 @@
+package com.mokamrp.privates.entity;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class SetGroupHandle {
+    @NotNull(message = "分组ID不可为空")
+    private Integer groupId;
+    @NotEmpty(message = "ids 不可为空")
+    private List<Integer> ids;
+}

src/main/java/com/mokamrp/privates/help/Analysis.java

@@ -61,10 +61,14 @@ public class Analysis {
                 Map<String,String> cell = new HashMap<>();
                 for (int j = 0; j < sheetRow.getPhysicalNumberOfCells(); j++) {
                     //将每一个单元格的值装入列集合
+                    if (sheetRow.getCell(j) == null){
+                        continue;
+                    }
                     sheetRow.getCell(j).setCellType(CellType.STRING);
                     if (sheetRow.getCell(j).getStringCellValue() == null || sheetRow.getCell(j).getStringCellValue().isEmpty()){
                         continue;
                     }
+                    System.out.println(sheetRow.getCell(j).getStringCellValue());
                     if(j>=field.size()){
                         break;
                     }
@@ -86,6 +90,10 @@ public class Analysis {
             e.printStackTrace();
             System.out.println("===================上传失败======================");
             throw e;
+        } catch(Throwable e){
+            e.printStackTrace();
+            System.out.println(e.getMessage());
+            throw e;
         }
 
         return row;

src/main/resources/application-local.properties

@@ -67,4 +67,4 @@ datahub.corpTopic=ods_hera_msv_corp_data
 datahub.project=hera
 
 #定时任务全局开关，本地环境无需开启
-cronjob.power=true
+cronjob.power=false