修改报表查询

device-manager-ui/admin/src/components/Header.vue

@@ -123,38 +123,8 @@ export default {
     },
   },
   beforeDestroy() {
-    //window.removeEventListener("message", this.getsocketData, false);
   },
   mounted() {
-    // console.log("mounted");
-    // this.$nextTick(function () {
-    //   console.log("login websocket:"+"ws://"+process.env.VUE_APP_WEBSOCKET_API +"/ws?accessToken="+ this.$store.state.userData.id)
-    //   createSocket(
-    //     "ws://" +
-    //       process.env.VUE_APP_WEBSOCKET_API +
-    //       "/ws?accessToken=" +
-    //       this.$store.state.userData.id
-    //   );
-    // });
-    //    let _this = this;
-    // const getsocketData = (e) => {i
-    //   // 创建接收消息函数
-    //   const data = e && e.detail.data;
-    //   let obj = JSON.parse(data);
-    //   if (obj.type == "SEND_TO_ALL_REQUEST") {
-    //     vm.refreshData();
-    //     let content = JSON.parse(obj.body.content);
-    //     _this.$notify({
-    //       title: "警告",
-    //       message: content,
-    //       type: "warning",
-    //       duration: 8000,
-    //     });
-    //   }
-    // };
-    // this.getsocketData = getsocketData;
-    // // 注册监听事件
-    // window.addEventListener("onmessageWS", getsocketData,false);
   },
   computed: {
     activeMenu() {
@@ -324,7 +294,7 @@ export default {
   }
 }
 
-@media screen and (max-width: 1500px) {
+@media screen and (max-width: 800px) {
   .layout-header {
     .mobile-menu-list {
       display: flex;

device-manager-ui/admin/src/views/device/module/dialogshow.vue

 <template>
     <!-- 弹出框表单 -->
     <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="160px">
             <el-row>
-                                            <Field label="模块名称" prop="moduleName" v-model="form.moduleName" type="textarea" placeholder="请输入模块名称"/>
-                            <Field label="模块消息编码，与上报消息头编码一致，唯一" prop="moduleMsgCode" v-model="form.moduleMsgCode" type="textarea" placeholder="请输入模块消息编码，与上报消息头编码一致，唯一"/>
+                             <Field :span="20" label="模块名称" prop="moduleName" v-model="form.moduleName" type="textarea" placeholder="请输入模块名称"/>
+                            <Field :span="20" label="模块消息编码" prop="moduleMsgCode" v-model="form.moduleMsgCode" type="textarea" placeholder="请输入模块消息编码，与上报消息头编码一致，唯一"/>
 
             </el-row>
 

device-manager/db/menu.sql

@@ -70,3 +70,21 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '设备模块信息-菜单管
 
 INSERT INTO `mortals_xhx_resource` VALUES (null, '短信发送记录-菜单管理-查看', '/alarm/sms/send/list,/alarm/sms/send/view,/alarm/sms/send/info,/alarm/sms/send/export,/alarm/sms/send/exportExcel,/alarm/sms/send/downloadTemplate,/alarm/sms/send/download', 3, 0, NULL, NULL, NULL, 0);
 INSERT INTO `mortals_xhx_resource` VALUES (null, '短信发送记录-菜单管理-维护', '/alarm/sms/send/add,/alarm/sms/send/edit,/alarm/sms/send/delete,/alarm/sms/send/logicDelete,/alarm/sms/send/save,/alarm/sms/send/importData', 3, 0, NULL, NULL, NULL, 0);
+
+
+INSERT INTO `mortals_xhx_resource` VALUES (null, '设备前端模块部署-菜单管理-查看', '/device/module/distribute/list,/device/module/distribute/view,/device/module/distribute/info,/device/module/distribute/export,/device/module/distribute/exportExcel,/device/module/distribute/downloadTemplate,/device/module/distribute/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '设备前端模块部署-菜单管理-维护', '/device/module/distribute/add,/device/module/distribute/edit,/device/module/distribute/delete,/device/module/distribute/logicDelete,/device/module/distribute/save,/device/module/distribute/importData', 3, 0, NULL, NULL, NULL, 0);
+
+INSERT INTO `mortals_xhx_resource` VALUES (null, '产品客户端版本-菜单管理-查看', '/product/version/list,/product/version/view,/product/version/info,/product/version/export,/product/version/exportExcel,/product/version/downloadTemplate,/product/version/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '产品客户端版本-菜单管理-维护', '/product/version/add,/product/version/edit,/product/version/delete,/product/version/logicDelete,/product/version/save,/product/version/importData', 3, 0, NULL, NULL, NULL, 0);
+
+INSERT INTO `mortals_xhx_resource` VALUES (null, '应用发布部署-菜单管理-查看', '/app/publish/list,/app/publish/view,/app/publish/info,/app/publish/export,/app/publish/exportExcel,/app/publish/downloadTemplate,/app/publish/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '应用发布部署-菜单管理-维护', '/app/publish/add,/app/publish/edit,/app/publish/delete,/app/publish/logicDelete,/app/publish/save,/app/publish/importData', 3, 0, NULL, NULL, NULL, 0);
+
+-- ----------------------------
+-- 应用发布部署参数 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用类型', 'AppPublish', 'appType', '0', '前端', 1, 4, 0, 'appType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '应用类型', 'AppPublish', 'appType', '1', '后端', 1, 4, 0, 'appType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '是否部署', 'AppPublish', 'distribute', '0', '否', 1, 4, 0, 'distribute', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '是否部署', 'AppPublish', 'distribute', '1', '是', 1, 4, 0, 'distribute', NULL, NULL, NULL);
\ No newline at end of file

device-manager/db/params.sql

@@ -94,3 +94,6 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '告警级别', 'DeviceAlarmInfo',
 INSERT INTO `mortals_xhx_param` VALUES (null, '告警状态,来自工单系统', 'DeviceAlarmInfo', 'alarmStatus', '0', '未清除', 1, 4, 0, 'alarmStatus', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '告警状态,来自工单系统', 'DeviceAlarmInfo', 'alarmStatus', '1', '清除未确认', 1, 4, 0, 'alarmStatus', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '告警状态,来自工单系统', 'DeviceAlarmInfo', 'alarmStatus', '2', '清除已确认', 1, 4, 0, 'alarmStatus', NULL, NULL, NULL);
+
+INSERT INTO `mortals_xhx_param` VALUES (null, '是否部署', 'DeviceModuleDistribute', 'distribute', '0', '否', 1, 4, 0, 'distribute', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '是否部署', 'DeviceModuleDistribute', 'distribute', '1', '是', 1, 4, 0, 'distribute', NULL, NULL, NULL);
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceAlarmInfoController.java

@@ -11,11 +11,13 @@ import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceAlarmInfoService;
 import com.mortals.xhx.module.device.service.DeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -51,9 +53,10 @@ public class DeviceAlarmInfoController extends BaseCRUDJsonBodyMappingController
 
     @Override
     protected void doListBefore(DeviceAlarmInfoEntity query, Map<String, Object> model, Context context) throws AppException {
-        query.setOrderField("createTime");
-        query.setOrderKind(OrderCol.DESCENDING);
         super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        }
     }
 
     @Override

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -113,9 +113,9 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
 
     @Override
     protected void doListBefore(DeviceEntity query, Map<String, Object> model, Context context) throws AppException {
-        List<OrderCol> orderColList = new ArrayList<>();
-        orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
-        query.setOrderColList(orderColList);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        }
         SiteHallPdu siteHallPdu = new SiteHallPdu();
         siteHallPdu.setSiteId(query.getSiteId());
         Rest<RespData<List<SiteHallPdu>>> rest = siteHallFeign.list(siteHallPdu);

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceLogController.java

@@ -5,16 +5,14 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.LogTypeEnum;
 import com.mortals.xhx.module.device.model.DeviceLogEntity;
 import com.mortals.xhx.module.device.service.DeviceLogService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -40,9 +38,9 @@ public class DeviceLogController extends BaseCRUDJsonBodyMappingController<Devic
 
     @Override
     protected void doListBefore(DeviceLogEntity query, Map<String, Object> model, Context context) throws AppException {
-        List<OrderCol> orderColList = new ArrayList<>();
-        orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
-        query.setOrderColList(orderColList);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        }
         super.doListBefore(query, model, context);
     }
 

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleDistributeController.java

@@ -12,7 +12,6 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.ImageReEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.feign.skin.ISkinBaseFeign;
 import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
 import com.mortals.xhx.module.device.service.DeviceModuleDistributeService;
 import com.mortals.xhx.module.product.model.ProductEntity;
@@ -46,9 +45,6 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
     @Autowired
     private ProductService productService;
 
-    @Autowired
-    private ISkinBaseFeign skinBaseFeign;
-
     public DeviceModuleDistributeController(){
         super.setModuleDesc( "设备前端模块部署");
     }

device-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -19,7 +19,7 @@
 
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
 			<property name="enableExecutorTime" value="true" />
-			<property name="showSql" value="true" />
+			<property name="showSql" value="false" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file