Bläddra i källkod

【NEW】新增隔离开关检查表获取上次检测值。

hao 4 år sedan
förälder
incheckning
cb9061c9f1

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusFjxgmdController.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @author railway
  * @since 2021-10-11
  */
-@Api(value = "rest/catenary/bus/fjxgmd", tags = "附加悬挂锚段")
+@Api(value = "rest/catenary/bus/fjxgmd", tags = "APP-附加悬挂锚段")
 @RestController
 @RequestMapping(value = "business/catenary/bus/fjxgmd")
 public class BusFjxgmdController extends BaseController {

+ 13 - 3
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -16,8 +16,9 @@ import javax.validation.Valid;
 import java.util.List;
 
 import javax.validation.Valid;
+import javax.websocket.server.PathParam;
 
-@Api(value = "rest/catenary/bus/jcb/glkg", tags = "隔离开关检查表")
+@Api(value = "rest/catenary/bus/jcb/glkg", tags = "APP-隔离开关检查表")
 @RestController
 @Validated
 @RequestMapping(value = "business/catenary/bus/jcb/glkg")
@@ -33,7 +34,7 @@ public class BusJcbGlkgController extends BaseController {
 
     @ApiOperation(value = "删除")
     @DeleteMapping("/{ids}")
-    public AjaxResult delete(@RequestParam String[] ids) {
+    public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
         return toAjax(busJcbGlkgService.delete(ids));
     }
 
@@ -45,7 +46,7 @@ public class BusJcbGlkgController extends BaseController {
 
     @ApiOperation(value = "单个")
     @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
+    public AjaxResult getInfo(@PathVariable(value = "id") String id) {
         BusJcbGlkg info = busJcbGlkgService.getInfo(id);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("info",info);
@@ -60,4 +61,13 @@ public class BusJcbGlkgController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "获取上次检测值")
+    @GetMapping(value = "getLastOne")
+    public AjaxResult getLastOne(BusJcbGlkg busJcbGlkg) {
+        BusJcbGlkg info = busJcbGlkgService.getLastOne(busJcbGlkg);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
 }

+ 6 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbGlkgMapper.java

@@ -40,4 +40,10 @@ public interface BusJcbGlkgMapper {
     */
     Page<BusJcbGlkg> getList(BusJcbGlkg busJcbGlkg);
 
+    /**
+     * 获取上次检测值
+     * @param busJcbGlkg
+     * @return
+     */
+    BusJcbGlkg getLastOne(BusJcbGlkg busJcbGlkg);
 }

+ 7 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbGlkgService.java

@@ -34,4 +34,11 @@ public interface IBusJcbGlkgService{
     */
     List<BusJcbGlkg> getList(BusJcbGlkg busJcbGlkg);
 
+    /**
+     * 获取上次检测值
+     * @param busJcbGlkg
+     * @return
+     */
+    BusJcbGlkg getLastOne(BusJcbGlkg busJcbGlkg);
+
 }

+ 5 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java

@@ -62,4 +62,9 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	public List<BusJcbGlkg> getList(BusJcbGlkg busJcbGlkg) {
 		return busJcbGlkgMapper.getList(busJcbGlkg);
 	}
+
+	@Override
+	public BusJcbGlkg getLastOne(BusJcbGlkg busJcbGlkg) {
+		return busJcbGlkgMapper.getLastOne(busJcbGlkg);
+	}
 }

+ 21 - 0
railway-business/src/main/resources/mapper/business/BusJcbGlkgMapper.xml

@@ -845,4 +845,25 @@
         </where>
     </select>
 
+    <select id="getLastOne" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+            bus_jcb_glkg
+        WHERE
+            submit_state = '1'and del_flag = '0'
+        <if test="qj!=null and qj!=''">
+            and qj=#{qj}
+        </if>
+        <if test="zzh!=null and zzh!=''">
+            and zzh=#{zzh}
+        </if>
+        <if test="kgh!=null and kgh!=''">
+            and kgh=#{kgh}
+        </if>
+        ORDER BY
+            update_time DESC
+            LIMIT 1
+    </select>
+
 </mapper>