lyhzzz 10 kuukautta sitten
vanhempi
commit
67aff8ccb9

+ 2 - 2
src/main/java/com/fdkankan/fusion/controller/TestController.java

@@ -115,7 +115,7 @@ public class TestController {
     IXfyunImageService xfyunImageService;
     @GetMapping("/testXfyun")
     public ResultData testXfyun(@RequestParam(required = false) String num){
-        XfyunImage xfyunImage = xfyunImageService.getByNum(num);
-        return ResultData.ok(xfyunImage);
+         xfyunImageService.saveByNum(num);
+        return ResultData.ok();
     }
 }

+ 27 - 15
src/main/java/com/fdkankan/fusion/entity/CaseInquestCriminal.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import com.fdkankan.fusion.common.util.DateUtils;
 import com.fdkankan.fusion.typehandle.JsonArrayTypeHandler;
@@ -28,7 +29,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("t_case_inquest_criminal")
+@TableName(value = "t_case_inquest_criminal",autoResultMap = true)
 public class CaseInquestCriminal implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -102,8 +103,8 @@ public class CaseInquestCriminal implements Serializable {
     /**
      * 签名
      */
-    @TableField("signature")
-    private String signature;
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray signature;
 
     /**
      * 签名时间
@@ -150,27 +151,29 @@ public class CaseInquestCriminal implements Serializable {
     /**
      * 现场保护人
      */
-    @TableField("protector")
-    private String protector;
+    @TableField(typeHandler = JsonObjTypeHandler.class)
+    private JSONObject protector;
 
     /**
      * 现场保护措施
      */
-    @TableField("protection_measures")
-    private String protectionMeasures;
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray protectionMeasures;
 
     /**
      * 现场情况
      */
-    @TableField("situation")
-    private String situation;
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray situation;
 
     /**
      * 变动原因
      */
-    @TableField("change_reason")
-    private String changeReason;
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray changeReason;
 
+    @TableField("change_reason_other_value")
+    private String changeReasonOtherValue;
     /**
      * 天气情况
      */
@@ -180,14 +183,14 @@ public class CaseInquestCriminal implements Serializable {
     /**
      * 光线
      */
-    @TableField("light")
-    private String light;
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray light;
 
     /**
      * 勘验指挥人
      */
-    @TableField("inquest_commander")
-    private String inquestCommander;
+    @TableField(typeHandler = JsonObjTypeHandler.class)
+    private JSONObject inquestCommander;
 
     /**
      * 勘验情况
@@ -247,5 +250,14 @@ public class CaseInquestCriminal implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField(exist = false)
+    private List<Date> times;
+
+    public Date getStartTime() {
+        return times.get(0);
+    }
 
+    public Date getEndTime() {
+        return times.get(1);
+    }
 }

+ 1 - 0
src/main/java/com/fdkankan/fusion/service/IXfyunImageService.java

@@ -13,5 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IXfyunImageService extends IService<XfyunImage> {
 
+    void saveByNum(String num);
     XfyunImage getByNum(String num);
 }

+ 12 - 3
src/main/java/com/fdkankan/fusion/service/impl/XfyunImageServiceImpl.java

@@ -14,6 +14,7 @@ import com.fdkankan.fusion.service.IXfyunImageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.fusion.xfyun.XfyunWebSocketListener;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -37,12 +38,21 @@ public class XfyunImageServiceImpl extends ServiceImpl<IXfyunImageMapper, XfyunI
     @Override
     public XfyunImage getByNum(String num) {
         LambdaQueryWrapper<XfyunImage> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(XfyunImage::getNum,num);
+        wrapper.eq(XfyunImage::getNum, num);
         List<XfyunImage> list1 = this.list(wrapper);
-        if(!list1.isEmpty()){
+        if (!list1.isEmpty()) {
             return list1.get(0);
         }
+        return null;
+    }
 
+    @Override
+    @Async
+    public void saveByNum(String num) {
+        XfyunImage byNum = this.getByNum(num);
+        if(byNum != null){
+            return;
+        }
         List<XfyunConfig> list = xfyunConfigService.list();
         if(list.isEmpty()){
             throw new BusinessException(ResultCode.XFYUN_CONFIG_NOT_EXIT);
@@ -68,7 +78,6 @@ public class XfyunImageServiceImpl extends ServiceImpl<IXfyunImageMapper, XfyunI
         xfyunImage.setImageUrl(imageOssPath);
         xfyunImage.setXfyunAnswer(xfyunResult);
         this.save(xfyunImage);
-        return xfyunImage;
     }
 
     public static void main(String[] args) {