Merge branch 'dev-cui'

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/controller/SmsLoginController.java

@@ -29,7 +29,7 @@ public class SmsLoginController {
         String agentcode = request.getParameter("agentcode");
         
         //判断手机号与企业编码是否存在
-        if(userTokenService.listCount(agentcode,phone).intValue() <= 0){
+        if(userTokenService.listMobileCount(agentcode,phone).intValue() <= 0){
             return ResultVoUtil.error("企业编码或手机号错误。");
         }
         

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java

@@ -199,5 +199,9 @@ public class PictureSourceResult {
      */
     Map<String,Object> extendedField;
 
+    /**
+     * 任务提交时间（提报日期时间戳）
+     */
+    Long submitTime;
 
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java

@@ -38,7 +38,27 @@ public class OcrMsgServiceImpl extends ServiceImpl<OcrMsgMapper, OcrMsg> impleme
         PageHelper.startPage(pageNum, pageSize);
         List<Map<Object, String>> selectPage = ocrmsgmapper.selectPage(userid,msgCategory);
         List<OcrMsgVO> resultList=  BeanUtil.copyToList(selectPage, OcrMsgVO.class);
-        return new PageInfo<>(resultList);
+
+        PageInfo<OcrMsgVO> pageInfo = new PageInfo<>(resultList);
+
+        // 判断是否有下一页
+        if (resultList.size() == pageSize) {
+            // 查询下一页数据，判断是否为空
+            int pageNumNew = pageNum+1;
+            PageHelper.startPage(pageNumNew, pageSize); // 查询下一页的第一个数据
+            List<Map<Object, String>> nextPage = ocrmsgmapper.selectPage(userid, msgCategory);
+            if (nextPage.isEmpty()) {
+                pageInfo.setHasNextPage(false);
+            } else {
+                pageInfo.setHasNextPage(true);
+            }
+        } else {
+            pageInfo.setHasNextPage(false);
+        }
+
+        return pageInfo;
+
+//        return new PageInfo<>(resultList);
     }
 
     @Override

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java

@@ -175,12 +175,12 @@ public class PictureDisposeTask implements Runnable{
                 picture.setField8(pictureSourceResult.getDiscoveredIssues());
                 //拜访日期
                 picture.setField11(pictureSourceResult.getVisitDate());
-                //拜访日期
-                if(StringUtils.isNotBlank(pictureSourceResult.getVisitDate())){
-                    Date date = DateUtil.parse(pictureSourceResult.getVisitDate(),"yyyy-MM-dd");
-                    picture.setSubmitDateTimestamp(date.getTime());
-                }
 
+                //提报日期时间戳
+                picture.setSubmitDateTimestamp(pictureSourceResult.getSubmitTime());
+
+                System.out.println("SubmitDateTimestamp1=================>>>>>>>"+pictureSourceResult.getSubmitTime());
+                System.out.println("SubmitDateTimestamp2=================>>>>>>>"+picture.getSubmitDateTimestamp());
 
                 //定位距离
                 picture.setField12(pictureSourceResult.getDistance());

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java

@@ -1,28 +1,34 @@
 package cn.jyjz.xiaoyao.ocr.thread.tasks;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.jyjz.xiaoyao.common.base.util.ObjectUtils;
 import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
-import cn.jyjz.xiaoyao.common.base.util.StringUtils;
-import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.thread.entity.PictureImgToLocalEntity;
 import cn.jyjz.xiaoyao.ocr.util.DownloadImgUtil;
-import cn.jyjz.xiaoyao.ocr.util.ImageClassUtil;
 import cn.jyjz.xiaoyao.ocr.util.ImageUtils;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import net.coobird.thumbnailator.Thumbnails;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.ClientProtocolException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
 /**
  * 无量云接口 数据处理队列
  *
@@ -30,6 +36,7 @@ import java.util.Map;
  * @version 1.0
  * @date 2024/3/14 11:15
  */
+@Slf4j
 public class PictureImgToLocalTask implements Runnable {
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -41,6 +48,8 @@ public class PictureImgToLocalTask implements Runnable {
         this.pictureImgToLocal = pictureImgToLocal;
     }
 
+    public static String api_test2_identify_url="http://127.0.0.1:7003/semantic";
+
     @Override
     public void run() {
         OcrPictureService ocrPictureService = SpringUtils.getBean("ocrPictureService");
@@ -62,6 +71,46 @@ public class PictureImgToLocalTask implements Runnable {
                     picture.setImgHash(ocrPictureClassifyAndHash.get("hash"));
                     picture.setClassificationid(ocrPictureClassifyAndHash.get("classId"));
                 }
+                //获取拍照时间
+//                JSONObject requestBody = new JSONObject();
+//                requestBody.put("task_id", "123");
+//                requestBody.put("img_path", picture.getLocalpictrueurl());
+//                System.out.println("img_path===============>>>>>>>>>"+picture.getLocalpictrueurl());
+//                HttpClient httpClient = HttpClients.createDefault();
+//                HttpPost httpPost = new HttpPost(PictureImgToLocalTask.api_test2_identify_url);
+//                StringEntity requestEntity = new StringEntity(requestBody.toString(), ContentType.APPLICATION_JSON);
+//                httpPost.setEntity(requestEntity);
+//                try {
+//                    HttpResponse response = httpClient.execute(httpPost);
+//                    HttpEntity responseEntity = response.getEntity();
+//                    if (responseEntity != null) {
+//                        String responseString = EntityUtils.toString(responseEntity);
+//                        JSONObject semanticResponseJson = JSONObject.parseObject(responseString);
+//                        System.out.println("semanticResponseJson===========>>>>>>>>"+semanticResponseJson.toString());
+//                        JSONObject semanticResult = semanticResponseJson.getJSONObject("semantic_result");
+//                        System.out.println("semanticResult===========>>>>>>>>"+semanticResult.toString());
+//                        // 获取键为"时间"的值
+//                        String timeValue = semanticResult.getString("时间");
+//                        System.out.println("timeValue===========>>>>>>>>"+timeValue);
+//                        // 假设时间值的格式为"yyyy-MM-dd HH:mm:ss"
+//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                        try {
+//                            // 解析时间字符串并转换为时间戳
+//                            Date date = sdf.parse(timeValue);
+//                            long timestamp = date.getTime();
+//                            // 将时间戳赋值给picture.setTime
+//                            picture.setPhotoDateTimestamp(timestamp);
+//                            System.out.println("picture.setPhotoDateTimestamp===========>>>>>>>>"+picture.getPhotoDateTimestamp());
+//                        } catch (ParseException e) {
+//                            // 如果解析失败，处理异常
+//                            e.printStackTrace();
+//                        }
+//                    }
+//                } catch (ClientProtocolException e) {
+//                    log.error("HTTP请求发生客户端协议异常: " + e.getMessage());
+//                } catch (IOException e) {
+//                    log.error("HTTP请求发生IO异常: " + e.getMessage());
+//                }
                 ocrPictureService.updateById(picture);
             }
         }

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml

@@ -42,7 +42,7 @@
             m.msg_category = #{msgCategory}
             AND m.send_status = '1'
             AND (m.receive_user_type = 2 or  FIND_IN_SET('${userid}', m.receive_user_ids))
-            order by m.create_time desc
+            order by CASE WHEN r.read_flag IS NULL THEN 0 ELSE 1 END,m.create_time desc
     </select>
 
     <select id="selectone" resultType="map">