eat

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>nanyang</artifactId>
-	<version>0.0.8</version>
+	<version>0.0.10</version>
 	<name>main-service</name>
 	<description>Demo project for Spring Boot</description>
 

src/main/java/com/yunzhi/nanyang/controller/MobileController.java

@@ -79,9 +79,11 @@ public class MobileController extends BaseController {
         }
 
         StpUtil.login(taPerson.getPersonId(), clientId);
+        LocalDateTime timeout = LocalDateTime.now().plusSeconds(StpUtil.getTokenTimeout());
         Map<String, Object> res = new HashMap<>();
         res.put("person", taPerson);
         res.put("token", StpUtil.getTokenValue());
+        res.put("tokenTimeout", DateUtils.toString(timeout, "yyyy-MM-dd HH:mm:ss"));
 
         return ResponseBean.success(res);
     }

src/main/java/com/yunzhi/nanyang/controller/TaDeviceJobController.java

@@ -91,14 +91,30 @@ public class TaDeviceJobController extends BaseController {
                                @ApiParam("农机ID") @RequestParam(value = "machineryId", required = false) String machineryId,
                                @ApiParam("人员ID") @RequestParam(value = "userId", required = false) String userId,
                                @ApiParam("人员手机") @RequestParam(value = "phone", required = false) String phone,
+                               @ApiParam("乡镇") @RequestParam(value = "town", required = false) String town,
                                @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
                                @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
                                @ApiParam(value = "开始时间", example = "2022-10-01") @RequestParam(value = "startDate") String startDate,
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate) throws Exception {
 
         IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
-        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
-        Double totalArea = taDeviceJobService.statisTotalArea(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("orgId", orgId);
+        params.put("orgName", orgName);
+        params.put("deviceKind", deviceKind);
+        params.put("deviceNo", deviceNo);
+        params.put("startDate", startDate);
+        params.put("endDate", endDate);
+        params.put("machineryName", machineryName);
+        params.put("userName", userName);
+        params.put("phone", phone);
+        params.put("machineryId", machineryId);
+        params.put("userId", userId);
+        params.put("town", town);
+
+        IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, params);
+        Double totalArea = taDeviceJobService.statisTotalArea(params);
         return ResponseBean.success(new HashMap<String, Object>(){{
             put("list", list);
             put("totalArea", totalArea);
@@ -125,6 +141,7 @@ public class TaDeviceJobController extends BaseController {
                                @ApiParam("农机ID") @RequestParam(value = "machineryId", required = false) String machineryId,
                                @ApiParam("人员ID") @RequestParam(value = "userId", required = false) String userId,
                                @ApiParam("人员手机") @RequestParam(value = "phone", required = false) String phone,
+                               @ApiParam("乡镇") @RequestParam(value = "town", required = false) String town,
                                @ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
                                @ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
 //                               @ApiParam("位置") @RequestParam(value = "address", required = false) String address,
@@ -132,7 +149,21 @@ public class TaDeviceJobController extends BaseController {
                                @ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate,
                                HttpServletResponse response) throws Exception {
 
-        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+        Map<String, Object> params = new HashMap<>();
+        params.put("orgId", orgId);
+        params.put("orgName", orgName);
+        params.put("deviceKind", deviceKind);
+        params.put("deviceNo", deviceNo);
+        params.put("startDate", startDate);
+        params.put("endDate", endDate);
+        params.put("machineryName", machineryName);
+        params.put("userName", userName);
+        params.put("phone", phone);
+        params.put("machineryId", machineryId);
+        params.put("userId", userId);
+        params.put("town", town);
+
+        List<TaDeviceJob> list = taDeviceJobService.listOrgBy(params);
 
         Double total = 0.0;
         if (list != null || list.size() > 0) {

src/main/java/com/yunzhi/nanyang/entity/SysUser.java

@@ -41,6 +41,9 @@ public class SysUser implements Serializable {
     @ApiModelProperty(value = "性别")
     private Integer sex;
 
+    @ApiModelProperty(value = "身份证")
+    private String idCard;
+
     @ApiModelProperty(value = "头像")
     private String avatar;
 

src/main/java/com/yunzhi/nanyang/entity/TaDeviceJob.java

@@ -97,6 +97,11 @@ public class TaDeviceJob implements Serializable, Cloneable {
      */
     @ApiModelProperty(name = "gps定位", notes = "")
     private String location;
+
+    @ApiModelProperty(name = "所属乡镇", notes = "")
+    @TableField(exist = false)
+    private String town;
+
     /**
      * 作业位置
      */

src/main/java/com/yunzhi/nanyang/mapper/TaDeviceJobMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import com.yunzhi.nanyang.entity.TaDeviceJob;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备作业表;(ta_device_job)表数据库访问层
@@ -18,41 +19,11 @@ import java.util.List;
 public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
 
      IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg,
-                                    @Param("orgId") String orgId,
-                                    @Param("orgName") String orgName,
-                                    @Param("deviceKind") String deviceKind,
-                                    @Param("deviceNo") String deviceNo,
-                                    @Param("startDate") String startDate,
-                                    @Param("endDate") String endDate,
-                                    @Param("machineryName") String machineryName,
-                                    @Param("userName") String userName,
-                                    @Param("phone") String phone,
-                                    @Param("machineryId") String machineryId,
-                                    @Param("userId") String userId);
+                                    @Param("params") Map<String, Object> params);
 
-     Double statisTotalArea(@Param("orgId") String orgId,
-                            @Param("orgName") String orgName,
-                            @Param("deviceKind") String deviceKind,
-                            @Param("deviceNo") String deviceNo,
-                            @Param("startDate") String startDate,
-                            @Param("endDate") String endDate,
-                            @Param("machineryName") String machineryName,
-                            @Param("userName") String userName,
-                            @Param("phone") String phone,
-                            @Param("machineryId") String machineryId,
-                            @Param("userId") String userId);
+     Double statisTotalArea(@Param("params") Map<String, Object> params);
 
-     List<TaDeviceJob> listOrgBy(@Param("orgId") String orgId,
-                                 @Param("orgName") String orgName,
-                                 @Param("deviceKind") String deviceKind,
-                                 @Param("deviceNo") String deviceNo,
-                                 @Param("startDate") String startDate,
-                                 @Param("endDate") String endDate,
-                                 @Param("machineryName") String machineryName,
-                                 @Param("userName") String userName,
-                                 @Param("phone") String phone,
-                                 @Param("machineryId") String machineryId,
-                                 @Param("userId") String userId);
+     List<TaDeviceJob> listOrgBy(@Param("params") Map<String, Object> params);
 
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg,
                                  @Param("deviceKind") String deviceKind,
@@ -63,4 +34,5 @@ public interface TaDeviceJobMapper  extends BaseMapper<TaDeviceJob>{
     List<TaMachinery> getMachineryListByUser(@Param("userId") String userId);
 
     Double sumArea();
+
 }

src/main/java/com/yunzhi/nanyang/service/TaDeviceJobService.java

@@ -5,6 +5,7 @@ import com.yunzhi.nanyang.entity.TaDeviceJob;
 import com.yunzhi.nanyang.entity.TaMachinery;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备作业表;(ta_device_job)表服务接口
@@ -14,11 +15,11 @@ import java.util.List;
  */
 public interface TaDeviceJobService extends IBaseService<TaDeviceJob> {
 
-    IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
+    IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, Map<String, Object> params);
 
-    Double statisTotalArea(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
+    Double statisTotalArea(Map<String, Object> params);
 
-    List<TaDeviceJob> listOrgBy(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId);
+    List<TaDeviceJob> listOrgBy(Map<String, Object> params);
 
     IPage<TaDeviceJob> getPageBy(IPage<TaDeviceJob> pg, String deviceKind, String deviceNo, String startDate, String endDate);
 

src/main/java/com/yunzhi/nanyang/service/impl/TaDeviceJobServiceImpl.java

@@ -8,6 +8,7 @@ import com.yunzhi.nanyang.mapper.TaDeviceJobMapper;
 import com.yunzhi.nanyang.service.TaDeviceJobService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备作业表;(ta_device_job)表服务实现类
@@ -19,18 +20,18 @@ import java.util.List;
 public class TaDeviceJobServiceImpl extends BaseServiceImpl<TaDeviceJobMapper, TaDeviceJob> implements TaDeviceJobService {
 
     @Override
-    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
-        return baseMapper.statisOrgBy(pg, orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+    public IPage<TaDeviceJob> statisOrgBy(IPage<TaDeviceJob> pg, Map<String, Object> params) {
+        return baseMapper.statisOrgBy(pg, params);
     }
 
     @Override
-    public Double statisTotalArea(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
-        return baseMapper.statisTotalArea(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+    public Double statisTotalArea(Map<String, Object> params) {
+        return baseMapper.statisTotalArea(params);
     }
 
     @Override
-    public List<TaDeviceJob> listOrgBy(String orgId, String orgName, String deviceKind, String deviceNo, String startDate, String endDate, String machineryName, String userName, String phone, String machineryId, String userId) {
-        return baseMapper.listOrgBy(orgId, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
+    public List<TaDeviceJob> listOrgBy(Map<String, Object> params) {
+        return baseMapper.listOrgBy(params);
     }
 
     @Override

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -7,39 +7,43 @@
         FROM
             ta_device_job t
             INNER JOIN ta_machinery s ON t.machinery_id = s.machinery_id
+            LEFT JOIN ta_location loc ON t.location = loc.location
 --             INNER JOIN ta_org m ON s.org_id = m.org_id
 --             LEFT JOIN sys_user n ON t.user_id = n.user_id
         WHERE
             1 = 1
-        <if test="deviceKind != null and deviceKind != ''">
-            AND t.device_kind = #{deviceKind}
+        <if test="params.deviceKind != null and params.deviceKind != ''">
+            AND t.device_kind = #{params.deviceKind}
         </if>
-        <if test="deviceNo != null and deviceNo != ''">
-            AND t.device_no = #{deviceNo}
+        <if test="params.deviceNo != null and params.deviceNo != ''">
+            AND t.device_no = #{params.deviceNo}
         </if>
-        <if test="orgId != null and orgId != ''">
-            AND t.org_id = #{orgId}
+        <if test="params.orgId != null and params.orgId != ''">
+            AND t.org_id = #{params.orgId}
         </if>
-        <if test="orgName != null and orgName != ''">
-            AND t.org_name LIKE CONCAT( '%', #{orgName}, '%' )
+        <if test="params.orgName != null and params.orgName != ''">
+            AND t.org_name LIKE CONCAT( '%', #{params.orgName}, '%' )
         </if>
-        <if test="machineryId != null and machineryId != ''">
-            AND s.machinery_id = #{machineryId}
+        <if test="params.machineryId != null and params.machineryId != ''">
+            AND s.machinery_id = #{params.machineryId}
         </if>
-        <if test="userId != null and userId != ''">
-            AND t.user_id = #{userId}
+        <if test="params.userId != null and params.userId != ''">
+            AND t.user_id = #{params.userId}
         </if>
-        <if test="machineryName != null and machineryName != ''">
-            AND s.`name` LIKE CONCAT( '%', #{machineryName}, '%' )
+        <if test="params.machineryName != null and params.machineryName != ''">
+            AND s.`name` LIKE CONCAT( '%', #{params.machineryName}, '%' )
         </if>
-        <if test="userName != null and userName != ''">
-            AND t.user_name LIKE CONCAT( '%', #{userName}, '%' )
+        <if test="params.userName != null and params.userName != ''">
+            AND t.user_name LIKE CONCAT( '%', #{params.userName}, '%' )
         </if>
-        <if test="phone != null and phone != ''">
-            AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+        <if test="params.phone != null and params.phone != ''">
+            AND t.phone LIKE CONCAT( '%', #{params.phone}, '%' )
         </if>
-        <if test="startDate != null and startDate != ''">
-            AND t.job_date BETWEEN #{startDate} AND #{endDate}
+        <if test="params.town != null and params.town != ''">
+            AND loc.town LIKE CONCAT( '%', #{params.town}, '%' )
+        </if>
+        <if test="params.startDate != null and params.startDate != ''">
+            AND t.job_date BETWEEN #{params.startDate} AND #{params.endDate}
         </if>
         AND s.`status` &gt; -1
         ORDER BY
@@ -48,6 +52,7 @@
 
     <select id="statisOrgBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
         SELECT
+            loc.town,
             s.`name` AS machinery_name,
             t.*
         <include refid="statisOrg"></include>
@@ -58,6 +63,7 @@
     </select>
     <select id="listOrgBy" resultType="com.yunzhi.nanyang.entity.TaDeviceJob">
         SELECT
+            loc.town,
             s.`name` AS machinery_name,
             t.*
         <include refid="statisOrg"></include>

src/main/resources/mapper/TaMachineryMapper.xml

@@ -12,6 +12,7 @@
                 FROM ta_machinery t
                 WHERE
                       t.`status` > -1
+                  AND IFNULL(t.thumb, '') != ''
                 <if test="orgId != null and orgId != ''">
                     AND t.org_id = #{orgId}
                 </if>
@@ -47,6 +48,7 @@
             INNER JOIN td_machinery_type n ON n.type_id = t.type_id
         WHERE
             t.`status` &gt; -1
+            AND IFNULL(t.thumb, '') != ''
             AND t.machinery_id &lt;= s.machinery_id
         <if test="typeId != null and typeId != ''">
             AND t.type_id = #{typeId}
@@ -80,6 +82,7 @@
         </if>
         WHERE
             t.`status` &gt; -1
+          AND IFNULL(t.thumb, '') != ''
         <if test="name != null and name != ''">
             AND t.`name` LIKE CONCAT('%', #{name}, '%')
         </if>

src/main/resources/mapper/TdDeviceMapper.xml

@@ -86,7 +86,7 @@
                     a.`name`
             ) m
         ORDER BY
-            m.`value` DESC;
+            m.`value` DESC
     </select>
     <select id="statisNumByOrgJob" resultType="com.yunzhi.nanyang.vo.ChartParam">
         SELECT
@@ -136,15 +136,22 @@
     </select>
     <select id="statisAreaByTown" resultType="com.yunzhi.nanyang.vo.ChartParam">
         SELECT
-            s.town as `name`,
-            sum( t.job_area ) AS `value`
+            *
         FROM
-            ta_device_job t
-                LEFT JOIN ta_location s ON t.location = s.location
-        WHERE
-            t.device_kind = #{deviceKind}
-          AND t.job_date &gt;= #{jobDate}
-        GROUP BY
-            s.town
+            (
+                SELECT
+                    s.town as `name`,
+                    sum( t.job_area ) AS `value`
+                FROM
+                    ta_device_job t
+                        LEFT JOIN ta_location s ON t.location = s.location
+                WHERE
+                    t.device_kind = #{deviceKind}
+                  AND t.job_date &gt;= #{jobDate}
+                GROUP BY
+                    s.town
+                ) m
+        ORDER BY
+            m.`value` DESC
     </select>
 </mapper>