liu hace 2 años
padre
commit
8d5e6bb48a

+ 5 - 0
pom.xml

@@ -263,6 +263,11 @@
             <artifactId>dingtalk</artifactId>
             <version>2.1.14</version>
         </dependency>
+        <dependency>
+            <groupId>com.template</groupId>
+            <artifactId>mybatis_plus</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

+ 10 - 6
src/main/java/com/template/common/utils/TimeExchange.java

@@ -9,6 +9,7 @@ import com.template.model.pojo.UnitTimeHelpModel;
 import com.template.model.vo.ClassSettingDateVo;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
+import org.aspectj.weaver.ast.Var;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -800,12 +801,15 @@ public class TimeExchange {
     }
 
     public static void main(String[] args) {
-        String result = "{\"errcode\":0,\"errmsg\":\"ok\",\"phone_info\":{\"phoneNumber\":\"18320846714\",\"purePhoneNumber\":\"18320846714\",\"countryCode\":\"86\",\"watermark\":{\"timestamp\":1716975315,\"appid\":\"wx2fc3f45732fae5d3\"}}}";
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        String errcode = String.valueOf(jsonObject.get("phone_info"));
-        JSONObject jsonErroObject = JSONObject.parseObject(errcode);
-        String purePhoneNumber = String.valueOf(jsonErroObject.get("purePhoneNumber"));
-        System.out.println(purePhoneNumber);
+//        String result = "{\"errcode\":0,\"errmsg\":\"ok\",\"phone_info\":{\"phoneNumber\":\"18320846714\",\"purePhoneNumber\":\"18320846714\",\"countryCode\":\"86\",\"watermark\":{\"timestamp\":1716975315,\"appid\":\"wx2fc3f45732fae5d3\"}}}";
+//        JSONObject jsonObject = JSONObject.parseObject(result);
+//        String errcode = String.valueOf(jsonObject.get("phone_info"));
+//        JSONObject jsonErroObject = JSONObject.parseObject(errcode);
+//        String purePhoneNumber = String.valueOf(jsonErroObject.get("purePhoneNumber"));
+//        System.out.println(purePhoneNumber);
+
+        String date = getDate();
+        System.out.println("date = " + date);
     }
 
 

+ 9 - 3
src/main/java/com/template/controller/SmartAuthorGroupController.java

@@ -14,6 +14,7 @@ import com.template.common.utils.TreeRecordsUtil;
 import com.template.common.utils.UUIDUtil;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
+import com.template.model.vo.SchoolClassVo;
 import com.template.model.weixin.AuthorAndGroup;
 import com.template.model.weixin.AuthorAndGroup2;
 import com.template.model.weixin.AuthorListGroup;
@@ -51,6 +52,9 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
     @Autowired
     public SmartMenuService smartMenuService;
 
+    @Autowired
+    public SmartClassService smartClassService;
+
     /**
      * 新增权限组
      *
@@ -719,9 +723,11 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
         }
         SmartUser smartUser = smartUserService.getById(userId);
         Integer schoolClass = smartUser.getSchoolClass();
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("schoolClass",schoolClass);
-        return CommonResult.ok(jsonObject);
+
+//        获取年级
+        SchoolClassVo schoolClassVo = smartClassService.getClassId(schoolClass);
+
+        return CommonResult.ok(schoolClassVo);
     }
 
 }

+ 1 - 5
src/main/java/com/template/services/impl/SmartCarAccessServiceImpl.java

@@ -42,7 +42,7 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
     private Integer page = 0;
     private Integer size = 20;
 
-    @Scheduled(cron = "0 42 * * * ? ")
+    @Scheduled(cron = "0 40 * * * ? ")
     @Async
     public void car() {
         if(scheduleConfig.getIsOpen().equals("1")) {
@@ -82,8 +82,6 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
         String startData = stateTime.format(dateTimeFormatter1);
         String endData = endTime.format(dateTimeFormatter1);
 
-        startData="2024-03-01 00:00:00";
-
 //        开始时间
         jsonObject.put("startTime", startData);
 //        jsonObject.put("startTime", "2024-06-26 00:00:00");
@@ -184,8 +182,6 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
         String startData = stateTime.format(dateTimeFormatter1);
         String endData = endTime.format(dateTimeFormatter1);
 
-        startData="2024-03-01 00:00:00";
-
 //        开始时间
         jsonObject.put("startTime", startData);
 //        jsonObject.put("startTime", "2024-06-26 00:00:00");

+ 1 - 1
src/main/resources/mapper/template/SmartUserMapper.xml

@@ -458,7 +458,7 @@
         </if>
     </select>
     <select id="getPage" resultType="com.template.model.vo.SmartUserPageVo">
-        SELECT su.id      as userId,
+        SELECT su.id as id,
         su.`name`  as name,
         su.card_no as cardNo,
         sc.`name`  as className