代码提交

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/alarm/AlarmTsController.java

@@ -12,10 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-@Controller
+@RestController
 @RequestMapping("/alarm")
 @Api(value = "预警", tags = "预警")
 public class AlarmTsController {

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/custom/PowerPointData.java

@@ -68,7 +68,7 @@ public class PowerPointData {
     private double dl = 0;
 
     //欠发状态 SSQFZT
-    @Desc(des = "欠发状态",  uniformCode = "RQFZT", remark = "1")
+    @Desc(des = "欠发状态",  uniformCode = "RQFDL", remark = "1")
     private int qfzt = 0;
 
 
@@ -81,7 +81,7 @@ public class PowerPointData {
     private double dfwc = 0;
 
     //偏航角度 AI073
-    @Desc(des = "偏航角度",  uniformCode = "AI073", remark = "1")
+    @Desc(des = "偏航角度",  uniformCode = "AI028", remark = "1")
     private double angle = 0;
 
     /**

power-fitting-JN/src/main/resources/mapper/AlarmTsXmlMapper.xml

@@ -10,7 +10,7 @@
 
             <if test="date !=null">
                 AND ts in
-                <foreach item="item" collection="date" separator="," open="(" close=")" index="">'${item}'</foreach>
+                <foreach item="item" collection="date" separator="," open="(" close=")" index="">${item}</foreach>
             </if>
 
             <if test="deviceid !=null">