Selaa lähdekoodia

httpclient 是为了微信小程序端的下发提醒使用

cr7118@sina.cn 3 vuotta sitten
vanhempi
commit
d31d121ac0

+ 37 - 14
application-task/pom.xml

@@ -21,12 +21,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-devtools</artifactId>-->
+        <!--            <scope>runtime</scope>-->
+        <!--            <optional>true</optional>-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -73,6 +73,29 @@
             <version>2.2.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>4.5.15</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+            <version>2.3.9.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.32</version>
+        </dependency>
 
     </dependencies>
 
@@ -81,14 +104,14 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-<!--                <configuration>-->
-<!--                    <excludes>-->
-<!--                        <exclude>-->
-<!--                            <groupId>org.projectlombok</groupId>-->
-<!--                            <artifactId>lombok</artifactId>-->
-<!--                        </exclude>-->
-<!--                    </excludes>-->
-<!--                </configuration>-->
+                <!--                <configuration>-->
+                <!--                    <excludes>-->
+                <!--                        <exclude>-->
+                <!--                            <groupId>org.projectlombok</groupId>-->
+                <!--                            <artifactId>lombok</artifactId>-->
+                <!--                        </exclude>-->
+                <!--                    </excludes>-->
+                <!--                </configuration>-->
             </plugin>
         </plugins>
     </build>

+ 18 - 0
application-task/src/main/java/com/jihengbel/intelligent/applicationtask/entry/OnsiteCalendar.java

@@ -14,6 +14,24 @@ public class OnsiteCalendar implements Serializable {
     private int month_day;
     private int user_id;
     private int type_flag;
+    private String task_time;
+    private long onsite_task_id;
+
+    public long getOnsite_task_id() {
+        return onsite_task_id;
+    }
+
+    public void setOnsite_task_id(long onsite_task_id) {
+        this.onsite_task_id = onsite_task_id;
+    }
+
+    public String getTask_time() {
+        return task_time;
+    }
+
+    public void setTask_time(String task_time) {
+        this.task_time = task_time;
+    }
 
 
     public long getId() {

+ 9 - 0
application-task/src/main/java/com/jihengbel/intelligent/applicationtask/model/OnsiteTaskMapper.java

@@ -26,5 +26,14 @@ public interface OnsiteTaskMapper {
     public List<OnsiteCalendar> getCalenderOnsitesForType(Map<String,Object> param);
 
 
+    /**
+     * 需要提醒的工作
+     * @param param
+     * @return
+     */
+    public List<OnsiteCalendar> getRemindWork(Map<String,Object> param);
+
+
+
 
 }

+ 11 - 1
application-task/src/main/resources/mappers/OnsiteTaskMapper.xml

@@ -14,10 +14,12 @@
         <result column="month_day" property="month_day"/>
         <result column="user_id" property="user_id"/>
         <result column="type_flag" property="type_flag"/>
+        <result column="task_time" property="task_time"/>
+        <result column="onsite_task_id" property="onsite_task_id"/>
     </resultMap>
 
 
-    <select id="getCalenderOnsitesForType" resultMap="calendarOnsite">
+    <select id="getCalenderOnsitesForType" resultMap="calendarOnsite">  <!-- todo  这个还需要状态 -->
         SELECT b.* FROM  benteler_plan a,onsite_calendar b
         WHERE
         a.id=b.benteler_plan_id and a.pause_flag=1
@@ -31,6 +33,14 @@
 
     </select>
 
+    <select id="getRemindWork" resultMap="calendarOnsite">
+        select b.*,a.task_time ,a.id onsite_task_id
+        from onsite_task a,onsite_calendar b
+        where a.onsite_calendar_id=b.id and a.status=0
+    </select>
+
+
+
 
     <insert id="insertOnsiteTask" parameterType="com.jihengbel.intelligent.applicationtask.entry.OnsiteTask">
         insert into onsite_task(onsite_calendar_id,task_time)