2019.1.22

(1)修改ABB报警记录接口
(2)修改权限

src/main/java/com/example/tdl/web/AlarmLogABBController.java

 package com.example.tdl.web;
 
 import com.aliyun.oss.OSSClient;
+import com.csvreader.CsvWriter;
 import com.example.tdl.common.CommonExcel;
 import com.example.tdl.domain.dto.CommFeedback;
 import com.example.tdl.domain.vo.*;
@@ -28,9 +29,15 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import static com.example.tdl.web.DataController.timeStamp2Date;
+
 
 @RestController
 @RequestMapping("/alarmLogABB")
@@ -261,41 +268,40 @@ public class AlarmLogABBController {
         alarmTermABBVo.setCompanyNo(user.getCompanyNo());
         List<ResultAlarmLogABBVo> resultAlarmLogVos=alarmLogABBService.getByTermForDownload(alarmTermABBVo);
         if (resultAlarmLogVos.size()>0){
-            String fileName = "报警日志数据-"+System.currentTimeMillis();
-            String fileAddress="E:/download";
-            File f = new File(fileAddress);
-            if(!f.exists()){
-                f.mkdir();
-            }
-            File file=new File(fileAddress+"/"+fileName);
-            AlarmLogForABBExcelUtil alarmLogForABBExcelUtil = new AlarmLogForABBExcelUtil(resultAlarmLogVos);
             try {
-                HSSFWorkbook workbook=alarmLogForABBExcelUtil.downloadExcel();
-                if (workbook!=null){
-                    request.setCharacterEncoding("utf-8");
-                    response.setCharacterEncoding("utf-8");
-                    response.setContentType("application/vnd.ms-excel");
-                    response.setHeader("Content-Disposition", "attachment; filename="+fileName);
-                    OutputStream os = new FileOutputStream(new File(file+".xls"));
-                    workbook.write(os);
-                    os.flush();
-                    os.close();
-                    ZipCompressUtil zipCom = new ZipCompressUtil(file+".zip",file+".xls");
+                String address="E:/";
+                String fileName="报警日志数据-"+System.currentTimeMillis();
+                CsvWriter csvWriter = new CsvWriter(address  + fileName+".csv", ',', Charset.forName("GB2312"));
+                // 创建CSV写对象 例如:CsvWriter(文件路径，分隔符，编码格式);
+                String[] rowsName={"运输编号","货物编号","传感器序列号","描述","报警数据","报警时间","报警参数"};
+
+                csvWriter.writeRecord(rowsName);
+                for (int i = 0; i < resultAlarmLogVos.size(); ++i) {
+                    String[] objs = new String[rowsName.length];
+                    objs[0] = String.valueOf(resultAlarmLogVos.get(i).getTransportationNo());
+                    objs[1] = String.valueOf(resultAlarmLogVos.get(i).getCargoNo());
+                    objs[2] = String.valueOf(resultAlarmLogVos.get(i).getTDLSN());
+                    objs[3] = String.valueOf(resultAlarmLogVos.get(i).getDescription());
+                    objs[4] = String.valueOf(resultAlarmLogVos.get(i).getData());
+                    SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//这个是你要转成后的时间的格式
+                    objs[5] = String.valueOf(sdf.format(new Date(resultAlarmLogVos.get(i).getAlarmTime())));
+                    objs[6] = String.valueOf(resultAlarmLogVos.get(i).getClassify());
+                    csvWriter.writeRecord(objs);
+                }
+                csvWriter.flush();
+                csvWriter.close();
+                ZipCompressUtil zipCom = new ZipCompressUtil(address + fileName+".zip", address + fileName+".csv");
                 zipCom.zip();
                 OSSClient ossClient = AliyunOSSClientUtil.getOSSClient();
-                    String resultStr =  AliyunOSSClientUtil.uploadObject2OSS(ossClient, new File(file +".zip"));
-                    if (new File(file+".xls").delete()){
+                String md5Key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, new File(address + fileName+ ".zip"));
+                if (md5Key != null) {
                     fb.setCode(1);
-                        fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/abbAlarm/"+fileName +".zip");
+                    fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/abbAlarm/" + fileName+ ".zip");
+                    new File(address + fileName).delete();
                     return gson.toJson(fb);
-                    }else{
+                } else {
                     fb.setCode(0);
-                        fb.setMessage("下载失败");
-                        return gson.toJson(fb);
-                    }
-                }else{
-                    fb.setCode(0);
-                    fb.setMessage("下载失败");
+                    fb.setMessage("上传失败");
                 }
             } catch (Exception e) {
                 e.printStackTrace();

src/main/java/com/example/tdl/web/HomePageController.java

@@ -98,25 +98,24 @@ public class HomePageController {
             @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
     })
     public Object getAll(@RequestBody String time, HttpServletRequest request){
-        String token = request.getHeader("Account_token");
-        String datum = tokenRedisService.get("TOKEN_" +token);
-        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        JSONObject jsonObject= JSON.parseObject(time);
-        time=(String) jsonObject.get("time");
+        UserRedisVo user =  gson.fromJson(tokenRedisService.get("TOKEN_" +request.getHeader("Account_token")),UserRedisVo.class);
+        time=(String) JSON.parseObject(time).get("time");
         time = time.replace("天","").trim();
-        //获取数量
+
         HomePageDataVo dataVo = new HomePageDataVo();
-        //获取所有的线路数量
-        dataVo.setSum(circuitService.getCount(time,System.currentTimeMillis()/1000l,user.getCompanyNo()));//总数量
-        //获取近几天的线路信息
-        dataVo.setOnRoute(circuitService.getOnRoute(user.getCompanyNo()));//在途数量
+        //总数量
+        dataVo.setSum(circuitService.getCount(time,System.currentTimeMillis()/1000l,user.getCompanyNo()));
+        //在途数量
+        dataVo.setOnRoute(circuitService.getOnRoute(user.getCompanyNo()));
         Integer delay =  circuitService.getDelayCount(System.currentTimeMillis(),time,user.getCompanyNo());
-
-        dataVo.setAlarmed( alarmLogServcie.getCount(time,user.getCompanyNo()));//报警数量
-        dataVo.setBump(alarmLogServcie.getBumpCount(time,user.getCompanyNo())); //获取颠簸数量
+        //报警数量
+        dataVo.setAlarmed( alarmLogServcie.getCount(time,user.getCompanyNo()));
+        //获取颠簸数量
+        dataVo.setBump(alarmLogServcie.getBumpCount(time,user.getCompanyNo()));
 //        dataVo.setAlarmLogVoList(alarmLogServcie.getAlarmLog(time,user.getCompanyNo()));//报警列表
         dataVo.setWarehouseVoList(warehouseService.getAll(user.getCompanyNo()));
-        List<HistogramData> list = alarmLogServcie.getByCount(time,user.getCompanyNo());//获取报警柱状图
+        //获取报警柱状图
+        List<HistogramData> list = alarmLogServcie.getByCount(time,user.getCompanyNo());
         list.add(new HistogramData("5",delay));
         //获取所有的仓库数据
         for(int j = 0,length = list.size();j<length;j++){

src/main/java/com/example/tdl/web/PermissionController.java

@@ -67,7 +67,7 @@ public class PermissionController {
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        String name = "管理员";
+        String name = "Administrator";
         List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyNo());
         //获取所有父侧边栏的名字
         List<String> parentSideLists=sideService.getSideTitleParentName();
@@ -129,7 +129,7 @@ public class PermissionController {
         JSONObject json = JSON.parseObject(roleName);
         roleName= (String) json.get("roleName");
         //获取该公司的所有权限
-        String name = "管理员";
+        String name = "Administrator";
         List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyNo());
         List<String> rolePermission = roleHasPermissionService.getByRoleName(roleName,user.getCompanyNo());
 
@@ -194,7 +194,7 @@ public class PermissionController {
             fb.setMessage(i18n.getMessage(request,"roleName"));
             return gson.toJson(fb);
         }
-        if("管理员".equals(addOrUpdatePermissionVo.getRoleName())){
+        if("Administrator".equals(addOrUpdatePermissionVo.getRoleName())){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"adminInoperable"));
             return gson.toJson(fb);

src/main/resources/application.properties

-spring.datasource.url=jdbc:mysql://localhost:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.1.14:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=37774020
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 

src/main/resources/i18n/messages_en.properties

@@ -305,15 +305,15 @@ TransportationState=Transportation State
 WarehouseStatus=Warehouse Status
 SystemSetup=System Setup
 InformationManagement=Information Management
-Devicemanagement=Device Management
+DeviceManagement=Device Management
 
 DataOverviewDetails=Data Overview Details
 TransportationList=Transportation List
 WarehouseList=Warehouse List
-Usermanagement=User Management
-Commonaddress=Common Address
+UserManagement=User Management
+CommonAddress=Common Address
 CompanyManagement=Company Management
-Warningmanagement=Warning Management
+WarningManagement=Warning Management
 AlarmManagement=Alarm Management
 AccountManagement=Account Management
 WarehouseManagement=Warehouse Management
@@ -376,4 +376,7 @@ AddSensor=Add Sensor
 ModifySensor=Modify Sensor
 DeleteSensor=Delete Sensor
 SensorAssignment=Sensor Assignment
+AlarmAnalysis=Alarm Analysis
+AlarmAnalysisDetail=Alarm Analysis Detail
+AlarmAnalysisQuery=Alarm Analysis Query
 usedgateway=The gateway has been used.
\ No newline at end of file

src/main/resources/i18n/messages_zh_CN.properties

@@ -408,5 +408,8 @@ AddSensor=\u4F20\u611F\u5668\u6DFB\u52A0
 ModifySensor=\u4F20\u611F\u5668\u4FEE\u6539
 DeleteSensor=\u4F20\u611F\u5668\u5220\u9664
 SensorAssignment=\u5206\u914D\u4F20\u611F\u5668
+AlarmAnalysis=\u62A5\u8B66\u5206\u6790
+AlarmAnalysisQuery=\u62A5\u8B66\u5206\u6790\u67E5\u8BE2
+AlarmAnalysisDetail=\u62A5\u8B66\u5206\u6790\u8BE6\u60C5