站点绑定公众号和小程序界面增加分组备注

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.mokamrp.privates.controller.BaseController;
+
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -50,16 +51,17 @@ public class FosterwxStationBindBoxController extends BaseController<FosterwxSta
      */
 
     @PostMapping("/list")
-    public Object list(@Valid @RequestBody GetForsterwxStationBindBoxHandle getForsterwxStationBindBoxHandle, BindingResult bindingResult){
+    public Object list(@Valid @RequestBody GetForsterwxStationBindBoxHandle getForsterwxStationBindBoxHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String,Object> res = fosterwxStationBindBoxService.getList(getForsterwxStationBindBoxHandle);
+        Map<String, Object> res = fosterwxStationBindBoxService.getList(getForsterwxStationBindBoxHandle);
         return AjaxResult.success(res);
     }
 
     /**
      * 导入
+     *
      * @param file
      * @param authUser
      * @return
@@ -73,13 +75,14 @@ public class FosterwxStationBindBoxController extends BaseController<FosterwxSta
         feild.put(2, "ghId");
         feild.put(3, "boxName");
         feild.put(4, "scope");
+        feild.put(5, "remark");
         List<Map<String, String>> row;
-        VoltaHandle<ArrayList<Map<String,String>>> voltaRes = Analysis.analysis(file, feild);
-        if (voltaRes.getErr() != null){
+        VoltaHandle<ArrayList<Map<String, String>>> voltaRes = Analysis.analysis(file, feild);
+        if (voltaRes.getErr() != null) {
             return AjaxResult.error(voltaRes.getErr());
         }
         row = voltaRes.getData();
-        Boolean res = fosterwxStationBindBoxService.importData(row,authUser);
+        Boolean res = fosterwxStationBindBoxService.importData(row, authUser);
         return AjaxResult.success(HttpMsg.importSuccess);
     }
 

src/main/java/com/mokamrp/privates/entity/pangu/GetForsterwxStationBindBoxHandle.java

@@ -11,6 +11,7 @@ public class GetForsterwxStationBindBoxHandle {
     private Integer pagesize;
     private Integer stationId;
     private String stationName;
+    private String remark;
     private Integer type;
     private String boxName;
     private List<String> ghId;

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxStationBindBoxMapper.xml

@@ -32,6 +32,7 @@
                 </foreach>
             </if>
             <if test="handle.uploadUid">and upload_uid = #{handle.uploadUid}</if>
+            <if test="handle.remark">and remark like concat('%',#{handle.remark},'%')</if>
         </where>
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/PromoteCodeMapper.xml

@@ -54,6 +54,7 @@
             <if test="promoteCodeListHandle.name != null">and A.name like CONCAT('%',#{promoteCodeListHandle.name},'%')</if>
             <if test="promoteCodeListHandle.startDate != null">and A.create_at between #{promoteCodeListHandle.startDate} and #{promoteCodeListHandle.endDate}</if>
         </where>
+        order by A.id desc
     </select>
     <select id="getInfo" resultType="com.mokamrp.privates.mapper.pangu.pojo.PromoteCodeVo">
         SELECT

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxStationBindBox.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -15,6 +17,7 @@ import java.io.Serializable;
  * @author leon
  * @since 2021-07-21
  */
+@Data
 @TableName("pan_fosterwx_station_bind_box")
 public class FosterwxStationBindBox extends Model<FosterwxStationBindBox> {
 
@@ -23,9 +26,10 @@ public class FosterwxStationBindBox extends Model<FosterwxStationBindBox> {
     /**
      * id
      */
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    private String remark;
     /**
      * 站点id(pan_fosterwx_station.id)
      */

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxStationBindBoxServiceImpl.java

@@ -68,6 +68,7 @@ public class FosterwxStationBindBoxServiceImpl extends ServiceImpl<FosterwxStati
             fosterwxStationBindBox.setGhId(row.get(i).get("ghId"));
             fosterwxStationBindBox.setBoxName(row.get(i).get("boxName"));
             fosterwxStationBindBox.setScope(row.get(i).get("scope"));
+            fosterwxStationBindBox.setRemark(row.get(i).get("remark"));
             fosterwxStationBindBox.setUploadUid(authUser.getId());
             fosterwxStationBindBox.setCreateAt(LocalDateTime.now());
             fosterwxStationBindBox.setUpdateAt(LocalDateTime.now());

src/test/java/com/mokamrp/WebTest.java

@@ -10,7 +10,6 @@ import com.mokamrp.privates.service.pangu.FosterwxMobilePoolService;
 import com.mokamrp.privates.service.pangu.FosterwxMobileService;
 import com.mokamrp.privates.service.pangu.FosterwxMobileTaskTimeListService;
 import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
-import com.mokamrp.privates.task.pangu.CheckPoolStatus;
 import com.mokamrp.privates.task.pangu.SyncFosterwxMobilePool;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -43,8 +42,6 @@ public class WebTest {
     @Autowired
     private FosterwxTaskScheduleService fosterwxTaskScheduleService;
 
-    @Autowired
-    private CheckPoolStatus checkPoolStatus;
 
     @Test
     public void test1() {
@@ -72,7 +69,7 @@ public class WebTest {
     @Test
     public void test2() {
         // syncFosterwxMobilePool.execute();
-        checkPoolStatus.execute();
+//        checkPoolStatus.execute();
     }
 
     /**