优化日期转换

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineRoadGateOpenListener.java

@@ -85,7 +85,7 @@ public class MachineRoadGateOpenListener extends BaseMachineListener {
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
 
-        JSONObject outParam = null;
+        //JSONObject outParam = null;
         ResponseEntity<String> responseEntity = null;
         Map<String, String> reqHeader = context.getRequestHeaders();
         String communityId = reqHeader.get("communityId");
@@ -103,9 +103,7 @@ public class MachineRoadGateOpenListener extends BaseMachineListener {
         machineDto.setCommunityId(communityId);
         List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
         if (machineDtos == null || machineDtos.size() < 1) {
-            outParam.put("code", -1);
-            outParam.put("message", "该设备【" + machineCode + "】未在该小区【" + communityId + "】注册");
-            responseEntity = new ResponseEntity<>(outParam.toJSONString(), headers, HttpStatus.OK);
+            responseEntity = MachineResDataVo.getResData(MachineResDataVo.CODE_ERROR,"该设备【" + machineCode + "】未在该小区【" + communityId + "】注册");
             context.setResponseEntity(responseEntity);
             return;
         }
@@ -256,7 +254,7 @@ public class MachineRoadGateOpenListener extends BaseMachineListener {
         context.setResponseEntity(responseEntity);
     }
 
-    private Object modifyCarInout(JSONObject reqJson, DataFlowContext context, CarInoutDto carInoutDto) {
+    private JSONObject modifyCarInout(JSONObject reqJson, DataFlowContext context, CarInoutDto carInoutDto) {
         JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_CAR_INOUT);
         business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);

WebService/src/main/resources/components/appPackage/app-manage/appManage.html

@@ -18,10 +18,10 @@
                         <tr>
                             <th>应用Id</th>
                             <th>应用名称</th>
-                            <th>秘钥</th>
+<!--                            <th>秘钥</th>-->
                             <th>白名单</th>
                             <th>黑名单</th>
-                            <th>备注</th>
+<!--                            <th>备注</th>-->
                             <th class="text-right">操作</th>
 
 
@@ -31,10 +31,10 @@
                             <tr v-for="app in appManageInfo.apps">
                             <td>{{app.appId}}</td>
                             <td>{{app.name}}</td>
-                            <td>{{app.securityCode}}</td>
+<!--                            <td>{{app.securityCode}}</td>-->
                             <td>{{app.whileListIp}}</td>
                             <td>{{app.blackListIp}}</td>
-                            <td>{{app.remark}}</td>
+<!--                            <td>{{app.remark}}</td>-->
                             <td><div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditAppModel(app)">修改</button>
                                 </div>

WebService/src/main/resources/components/feePackage/view-parkingSpace-fee-config/viewParkingSpaceFeeConfig.js

@@ -33,7 +33,7 @@
                  configId:"",
                  additionalAmount:"",
                  squarePrice:"",
-                 feeName:"临时地下停车费",
+                 feeName:"临时停车费",
                  feeTypeCd:'888800010007'
              }
         },

java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java

@@ -1,6 +1,8 @@
 package com.java110.dto.hardwareAdapation;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.java110.dto.PageDto;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,12 +17,16 @@ import java.util.Date;
  **/
 public class CarInoutDto extends PageDto implements Serializable {
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date inTime;
     private String inoutId;
     private String carNum;
     private String state;
     private String[] states;
     private String communityId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date outTime;
 
 

java110-bean/src/main/java/com/java110/vo/api/carInout/ApiCarInoutDataVo.java

@@ -6,41 +6,50 @@ import java.util.Date;
 public class ApiCarInoutDataVo implements Serializable {
 
     private String inoutId;
-private String state;
-private String carNum;
-private String inTime;
-private String outTime;
-public String getInoutId() {
+    private String state;
+    private String carNum;
+    private String inTime;
+    private String outTime;
+
+    public String getInoutId() {
         return inoutId;
     }
-public void setInoutId(String inoutId) {
+
+    public void setInoutId(String inoutId) {
         this.inoutId = inoutId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCarNum() {
+
+    public String getCarNum() {
         return carNum;
     }
-public void setCarNum(String carNum) {
+
+    public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
-public String getInTime() {
+
+    public String getInTime() {
         return inTime;
     }
-public void setInTime(String inTime) {
+
+    public void setInTime(String inTime) {
         this.inTime = inTime;
     }
-public String getOutTime() {
+
+    public String getOutTime() {
         return outTime;
     }
-public void setOutTime(String outTime) {
+
+    public void setOutTime(String outTime) {
         this.outTime = outTime;
     }
 
 
-
 }