getAppDevice(String devcode);
+ String saveFile(MultipartFile var1) throws IOException;
+ String findModeCodeByCode(String devcode);
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
index c5d7e5a..083caac 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.service.IService;
import com.casic.missiles.modular.app.model.AppDeviceLog;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +15,5 @@
*/
public interface IAppDeviceLogService extends IService {
+ List getListByCode(String devcode);
}
diff --git a/casic-app/pom.xml b/casic-app/pom.xml
index 9add040..320765b 100644
--- a/casic-app/pom.xml
+++ b/casic-app/pom.xml
@@ -70,6 +70,11 @@
org.apache.commons
commons-lang3
+
+ com.casic
+ casic-file
+ ${casic.version}
+
@@ -79,6 +84,7 @@
**/*.xml
+ true
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 8514576..46c47ee 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -5,17 +5,33 @@
import com.casic.missiles.core.base.controller.BaseController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.core.common.service.ICommonFileService;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.common.service.ICommonUserService;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.app.dto.SelectDTO;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
+import com.casic.missiles.modular.app.service.IAppDeviceLogService;
+import com.casic.missiles.modular.system.model.Dict;
+import com.casic.missiles.service.ICasicFileService;
import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 施工添加设备控制器
@@ -30,7 +46,12 @@
@Resource
private IAppDeviceAddService appDeviceAddService;
-
+ @Resource
+ private IAppDeviceLogService appDeviceLogService;
+ @Resource
+ private ICommonFileService commonFileService;
+ @Resource
+ private ICommonPermissionService permissionService;
/**
* 获取施工添加设备列表
@@ -65,7 +86,13 @@
if (CollectionUtils.isNotEmpty(appDeviceAddList)) {
return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加");
}
+ if (ToolUtil.isNotEmpty(appDeviceAdd.getInstalltimeFmt())) {
+ appDeviceAdd.setInstalltime(DateUtil.parseDate(appDeviceAdd.getInstalltimeFmt()));
+ }
appDeviceAddService.insert(appDeviceAdd);
+ if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
+ appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
+ }
return ResponseData.success();
}
@@ -99,4 +126,57 @@
return ResponseData.success();
}
+// @RequestMapping({"/fileUpload"})
+// @ResponseBody
+// public Object imageUpload(@RequestParam("file") MultipartFile file) throws IOException {
+// String fileId = this.appDeviceAddService.saveFile(file);
+// return fileId != null ? ResponseData.success(fileId) : ResponseData.error("文件为空");
+// }
+
+
+ @RequestMapping({"/fileUpload"})
+ @ResponseBody
+ public Object imageBase64Upload(@RequestBody(required =false) String fileBase64) throws IOException {
+ return ResponseData.success(commonFileService.saveFileBase64Image(fileBase64));
+
+ }
+
+ @RequestMapping({"/getWellTypeList"})
+ @ResponseBody
+ public Object getWellTypeList() {
+ List selectDTOList = new ArrayList<>();
+ List dictList = permissionService.findInDictByCode("sluicewellType");
+ for (Dict dict : dictList) {
+ SelectDTO selectDTO = new SelectDTO();
+ selectDTO.setText(dict.getName());
+ selectDTO.setValue(dict.getCode());
+ selectDTOList.add(selectDTO);
+ }
+ return selectDTOList;
+ }
+
+
+ /**
+ * 按照设备编号查询
+ */
+ @RequestMapping(value = "/findListByCodes")
+ @ResponseBody
+ public Object findListByCodes(String devcodes) {
+ List list = ToolUtil.isNotEmpty(devcodes) ?
+ Arrays.asList(devcodes.split(",")) :
+ new ArrayList() {{
+ add("");
+ }};
+ EntityWrapper query = new EntityWrapper<>();
+ query.in("devcode", list);
+ return ResponseData.success(appDeviceAddService.selectList(query));
+ }
+
+ /**a * 按照设备编号查询
+ */
+ @RequestMapping(value = "/findModeCodeByCode")
+ @ResponseBody
+ public Object findModeCodeByCode(String devcode) {
+ return appDeviceAddService.findModeCodeByCode(devcode);
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index a7733d8..7eb0dbc 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -6,10 +6,13 @@
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.base.response.SuccessResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
import com.casic.missiles.modular.app.service.IAppDeviceLogService;
+import com.casic.missiles.modular.app.util.DateUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -22,12 +25,12 @@
* 施工添加设备控制器
*
* @author dev
- * @Date 2020-05-24 11:21:38
+ * @Date 2020-05-24 11:21:38a
*/
@Controller
@RequestMapping("/appDeviceLog")
public class AppDeviceLogController extends BaseController {
-
+ private static String specialStr = "undefined";
@Resource
private IAppDeviceLogService appDeviceLogService;
@@ -50,10 +53,23 @@
*/
@RequestMapping(value = "/listPage")
@ResponseBody
- public Object listPage(String condition) {
- Page page = new PageFactory().defaultPage();
- EntityWrapper query = new EntityWrapper<>();
- page = appDeviceLogService.selectPage(page, query);
+ public Object listPage(String devcode, String devtype, String installtimeFmt, String project) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ if (ToolUtil.isNotEmpty(devcode) && (!(specialStr.equals(devcode)))) {
+ query.like("devcode", devcode);
+ }
+ if (ToolUtil.isNotEmpty(installtimeFmt) && (!(specialStr.equals(installtimeFmt)))) {
+ query.eq("installtime",DateUtil.parse(installtimeFmt,"yyyy-MM-dd"));
+ }
+ if (ToolUtil.isNotEmpty(project) && (!(specialStr.equals(project)))) {
+ query.eq("project", project);
+ }
+ if (ToolUtil.isNotEmpty(devtype) && (!(specialStr.equals(devtype)))) {
+ query.eq("devicetype", devtype);
+ }
+ query.orderBy("createtime", false);
+ page = appDeviceAddService.selectPage(page, query);
return new SuccessResponseData(super.packForBT(page));
}
@@ -63,11 +79,15 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(AppDeviceLog appDeviceLog) {
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltimeFmt())) {
+ appDeviceLog.setInstalltime(DateUtil.parseDate(appDeviceLog.getInstalltimeFmt()));
+ }
appDeviceLogService.insert(appDeviceLog);
//添加运维日志的同时更新施工日志
List appDeviceAddList =
appDeviceAddService.getAppDevice(appDeviceLog.getDevcode());
- appDeviceAddService.updateBatchById(appDeviceAddList);
+
+ appDeviceAddService.updateBatchById(AppDeviceAdd.convert(appDeviceAddList, appDeviceLog));
return ResponseData.success();
}
@@ -102,4 +122,43 @@
}
+ /**
+ * 获取施工添加设备分页列表
+ */
+ @RequestMapping(value = "/deviceDetail")
+ @ResponseBody
+ public Object deviceDetail(String devcode) {
+ EntityWrapper ew = new EntityWrapper<>();
+ ew.eq("devcode", devcode);
+ AppDeviceAdd appDeviceAdd = appDeviceAddService.selectOne(ew);
+
+ EntityWrapper query = new EntityWrapper<>();
+ query.eq("devcode", devcode);
+ query.orderBy("id", false);
+ List appDeviceLogList = appDeviceLogService.selectList(query);
+ String logs = "";
+ for (AppDeviceLog appDeviceLog : appDeviceLogList) {
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltime())) {
+ appDeviceLog.setInstalltimeFmt(DateUtils.sdf_day.format(appDeviceLog.getInstalltime()));
+ }
+ logs += appDeviceLog.getInstalltimeFmt() + ":" +
+ appDeviceLog.getInstallperson() + "," +
+ appDeviceLog.getDescription() + ";\n";
+ }
+ if (null != appDeviceAdd) {
+ if (ToolUtil.isNotEmpty(appDeviceAdd.getInstalltime())) {
+ appDeviceAdd.setInstalltimeFmt(DateUtils.sdf_day.format(appDeviceAdd.getInstalltime()));
+
+ }
+ appDeviceAdd.setLogs(logs);
+ }
+ if(appDeviceLogList.size()>0){
+ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1());
+ appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2());
+ appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3());
+ }
+ return new SuccessResponseData(appDeviceAdd);
+ }
+
+
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
index 4b9be7a..18f1929 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import org.apache.ibatis.annotations.Param;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +14,6 @@
*/
public interface AppDeviceAddMapper extends BaseMapper {
+ String findModeCodeByCode(@Param("devcode") String devcode);
+
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
index 07ead85..dba6207 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
@@ -1,6 +1,6 @@
-
+
@@ -29,4 +29,11 @@
id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype
+
+
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java
new file mode 100644
index 0000000..5c91b6a
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.app.dto;
+
+public class SelectDTO {
+ private String text;
+ private String value;
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
index 61862b2..1385e2c 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
@@ -2,16 +2,24 @@
import java.io.Serializable;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.ArrayList;
import java.util.Date;
+
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+
import java.io.Serializable;
+import java.util.List;
/**
*
- *
+ *
*
*
* @author stylefeng123
@@ -55,10 +63,21 @@
* 安装时间
*/
private Date installtime;
- /**ap
- * 照片路径
+ /**
+ *
+ * 照片路径1
*/
- private String photopath;
+ private String photopath1;
+ /**
+ *
+ * 照片路径2
+ */
+ private String photopath2;
+ /**
+ *
+ * 照片路径3
+ */
+ private String photopath3;
/**
* 权属单位
*/
@@ -96,6 +115,12 @@
*/
private String devicetype;
+ @TableField(exist = false)
+ private String installtimeFmt;
+
+ @TableField(exist = false)
+ private String logs;
+
public Long getId() {
return id;
@@ -161,13 +186,6 @@
this.installtime = installtime;
}
- public String getPhotopath() {
- return photopath;
- }
-
- public void setPhotopath(String photopath) {
- this.photopath = photopath;
- }
public String getFactory() {
return factory;
@@ -241,6 +259,46 @@
this.devicetype = devicetype;
}
+ public String getInstalltimeFmt() {
+ return installtimeFmt;
+ }
+
+ public void setInstalltimeFmt(String installtimeFmt) {
+ this.installtimeFmt = installtimeFmt;
+ }
+
+ public String getLogs() {
+ return logs;
+ }
+
+ public void setLogs(String logs) {
+ this.logs = logs;
+ }
+
+ public String getPhotopath1() {
+ return photopath1;
+ }
+
+ public void setPhotopath1(String photopath1) {
+ this.photopath1 = photopath1;
+ }
+
+ public String getPhotopath2() {
+ return photopath2;
+ }
+
+ public void setPhotopath2(String photopath2) {
+ this.photopath2 = photopath2;
+ }
+
+ public String getPhotopath3() {
+ return photopath3;
+ }
+
+ public void setPhotopath3(String photopath3) {
+ this.photopath3 = photopath3;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -249,24 +307,62 @@
@Override
public String toString() {
return "AppDeviceAdd{" +
- "id=" + id +
- ", devcode=" + devcode +
- ", wellcode=" + wellcode +
- ", welltype=" + welltype +
- ", welldepth=" + welldepth +
- ", installheigt=" + installheigt +
- ", installperson=" + installperson +
- ", installtime=" + installtime +
- ", photopath=" + photopath +
- ", factory=" + factory +
- ", project=" + project +
- ", workmsg=" + workmsg +
- ", position=" + position +
- ", description=" + description +
- ", createtime=" + createtime +
- ", longitude=" + longitude +
- ", latitude=" + latitude +
- ", devicetype=" + devicetype +
- "}";
+ "id=" + id +
+ ", devcode=" + devcode +
+ ", wellcode=" + wellcode +
+ ", welltype=" + welltype +
+ ", welldepth=" + welldepth +
+ ", installheigt=" + installheigt +
+ ", installperson=" + installperson +
+ ", installtime=" + installtime +
+ ", factory=" + factory +
+ ", project=" + project +
+ ", workmsg=" + workmsg +
+ ", position=" + position +
+ ", description=" + description +
+ ", createtime=" + createtime +
+ ", longitude=" + longitude +
+ ", latitude=" + latitude +
+ ", devicetype=" + devicetype +
+ "}";
+ }
+
+ public AppDeviceAdd() {
+ }
+
+ public static AppDeviceAdd appDeviceLogFormt(AppDeviceAdd appDeviceAdd, AppDeviceLog appDeviceLog) {
+ if (null == appDeviceLog) {
+ return appDeviceAdd;
+ }
+ appDeviceAdd.devcode = appDeviceLog.getDevcode();
+ appDeviceAdd.wellcode = appDeviceLog.getWellcode();
+ appDeviceAdd.welltype = appDeviceLog.getWelltype();
+ appDeviceAdd.welldepth = appDeviceLog.getWelldepth();
+ appDeviceAdd.installheigt = appDeviceLog.getInstallheigt();
+ appDeviceAdd.installperson = appDeviceLog.getInstallperson();
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltimeFmt())) {
+ appDeviceAdd.installtime = (DateUtil.parseDate(appDeviceLog.getInstalltimeFmt()));
+ }
+// appDeviceAdd.photopath = appDeviceLog.getPhotopath();
+ appDeviceAdd.factory = appDeviceLog.getFactory();
+ appDeviceAdd.project = appDeviceLog.getProject();
+ appDeviceAdd.workmsg = appDeviceLog.getWorkmsg();
+ appDeviceAdd.position = appDeviceLog.getPosition();
+ appDeviceAdd.description = appDeviceLog.getDescription();
+ appDeviceAdd.longitude = appDeviceLog.getLongitude();
+ appDeviceAdd.latitude = appDeviceLog.getLatitude();
+ appDeviceAdd.devicetype = appDeviceLog.getDevicetype();
+ appDeviceAdd.createtime = new Date();
+ return appDeviceAdd;
+
+ }
+
+ public static List convert(List appDeviceAdds,
+ AppDeviceLog appDeviceLog) {
+ List appDeviceAddList = new ArrayList<>();
+ for (AppDeviceAdd appDeviceAdd : appDeviceAdds) {
+ appDeviceAddList.add(appDeviceLogFormt(appDeviceAdd, appDeviceLog));
+ }
+ return appDeviceAddList;
}
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
index 1be81fb..2c4a7be 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
@@ -2,11 +2,15 @@
import java.io.Serializable;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+
import java.io.Serializable;
/**
@@ -56,9 +60,20 @@
*/
private Date installtime;
/**
- * 照片路径
+ *
+ * 照片路径1
*/
- private String photopath;
+ private String photopath1;
+ /**
+ *
+ * 照片路径2
+ */
+ private String photopath2;
+ /**
+ *
+ * 照片路径3
+ */
+ private String photopath3;
/**
* 权属单位
*/
@@ -96,6 +111,9 @@
*/
private String devicetype;
+ @TableField(exist = false)
+ private String installtimeFmt;
+
public Long getId() {
return id;
@@ -161,12 +179,28 @@
this.installtime = installtime;
}
- public String getPhotopath() {
- return photopath;
+ public String getPhotopath1() {
+ return photopath1;
}
- public void setPhotopath(String photopath) {
- this.photopath = photopath;
+ public void setPhotopath1(String photopath1) {
+ this.photopath1 = photopath1;
+ }
+
+ public String getPhotopath2() {
+ return photopath2;
+ }
+
+ public void setPhotopath2(String photopath2) {
+ this.photopath2 = photopath2;
+ }
+
+ public String getPhotopath3() {
+ return photopath3;
+ }
+
+ public void setPhotopath3(String photopath3) {
+ this.photopath3 = photopath3;
}
public String getFactory() {
@@ -241,6 +275,14 @@
this.devicetype = devicetype;
}
+ public String getInstalltimeFmt() {
+ return installtimeFmt;
+ }
+
+ public void setInstalltimeFmt(String installtimeFmt) {
+ this.installtimeFmt = installtimeFmt;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -257,7 +299,6 @@
", installheigt=" + installheigt +
", installperson=" + installperson +
", installtime=" + installtime +
- ", photopath=" + photopath +
", factory=" + factory +
", project=" + project +
", workmsg=" + workmsg +
@@ -269,4 +310,32 @@
", devicetype=" + devicetype +
"}";
}
+
+ public AppDeviceLog() {
+ }
+
+ public AppDeviceLog(AppDeviceAdd appDeviceAdd) {
+ this.devcode = appDeviceAdd.getDevcode();
+ this.wellcode = appDeviceAdd.getWellcode();
+ this.welltype = appDeviceAdd.getWelltype();
+ this.welldepth = appDeviceAdd.getWelldepth();
+ this.installheigt = appDeviceAdd.getInstallheigt();
+ this.installperson = appDeviceAdd.getInstallperson();
+ if(ToolUtil.isNotEmpty(appDeviceAdd.getInstalltimeFmt())){
+ this.installtime=(DateUtil.parseDate(appDeviceAdd.getInstalltimeFmt()));
+ }
+// this.photopath = appDeviceAdd.getPhotopath();
+ this.photopath1 = appDeviceAdd.getPhotopath1();
+ this.photopath2 = appDeviceAdd.getPhotopath2();
+ this.photopath3 = appDeviceAdd.getPhotopath3();
+ this.factory = appDeviceAdd.getFactory();
+ this.project = appDeviceAdd.getProject();
+ this.workmsg = appDeviceAdd.getWorkmsg();
+ this.position = appDeviceAdd.getPosition();
+ this.description = appDeviceAdd.getDescription();
+ this.longitude = appDeviceAdd.getLongitude();
+ this.latitude = appDeviceAdd.getLatitude();
+ this.devicetype = appDeviceAdd.getDevicetype();
+
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
index d1aaf2a..d3f2c53 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.service.IService;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.List;
/**
@@ -16,4 +18,6 @@
public interface IAppDeviceAddService extends IService {
List getAppDevice(String devcode);
+ String saveFile(MultipartFile var1) throws IOException;
+ String findModeCodeByCode(String devcode);
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
index c5d7e5a..083caac 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.service.IService;
import com.casic.missiles.modular.app.model.AppDeviceLog;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +15,5 @@
*/
public interface IAppDeviceLogService extends IService {
+ List getListByCode(String devcode);
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
index e6a43b4..5a3ce82 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
@@ -5,9 +5,16 @@
import com.casic.missiles.modular.app.dao.AppDeviceAddMapper;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
/**
*
@@ -20,6 +27,8 @@
@Service
public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService {
+ @Value("${casic.file-download-path}")
+ private String downloadPath;
@Override
public List getAppDevice(String devcode) {
@@ -28,4 +37,28 @@
return selectList(ew);
}
+
+ @Override
+ public String saveFile(MultipartFile file) throws IOException {
+ if (!file.isEmpty()) {
+ String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+ String filePrex = uuid + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+ String fileName = (new SimpleDateFormat("yyyy-MM")).format(new Date());
+ File dir = new File(downloadPath + fileName);
+ if (!dir.exists()) {
+ dir.mkdirs();
+ }
+ String pathName = dir.getPath() + File.separator + filePrex;
+ file.transferTo(new File(pathName));
+// return fileName.concat(File.separator).concat(filePrex);
+ return pathName;
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String findModeCodeByCode(String devcode) {
+ return this.baseMapper.findModeCodeByCode(devcode);
+ }
}
diff --git a/casic-app/pom.xml b/casic-app/pom.xml
index 9add040..320765b 100644
--- a/casic-app/pom.xml
+++ b/casic-app/pom.xml
@@ -70,6 +70,11 @@
org.apache.commons
commons-lang3
+
+ com.casic
+ casic-file
+ ${casic.version}
+
@@ -79,6 +84,7 @@
**/*.xml
+ true
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 8514576..46c47ee 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -5,17 +5,33 @@
import com.casic.missiles.core.base.controller.BaseController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.core.common.service.ICommonFileService;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.common.service.ICommonUserService;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.app.dto.SelectDTO;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
+import com.casic.missiles.modular.app.service.IAppDeviceLogService;
+import com.casic.missiles.modular.system.model.Dict;
+import com.casic.missiles.service.ICasicFileService;
import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 施工添加设备控制器
@@ -30,7 +46,12 @@
@Resource
private IAppDeviceAddService appDeviceAddService;
-
+ @Resource
+ private IAppDeviceLogService appDeviceLogService;
+ @Resource
+ private ICommonFileService commonFileService;
+ @Resource
+ private ICommonPermissionService permissionService;
/**
* 获取施工添加设备列表
@@ -65,7 +86,13 @@
if (CollectionUtils.isNotEmpty(appDeviceAddList)) {
return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加");
}
+ if (ToolUtil.isNotEmpty(appDeviceAdd.getInstalltimeFmt())) {
+ appDeviceAdd.setInstalltime(DateUtil.parseDate(appDeviceAdd.getInstalltimeFmt()));
+ }
appDeviceAddService.insert(appDeviceAdd);
+ if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
+ appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
+ }
return ResponseData.success();
}
@@ -99,4 +126,57 @@
return ResponseData.success();
}
+// @RequestMapping({"/fileUpload"})
+// @ResponseBody
+// public Object imageUpload(@RequestParam("file") MultipartFile file) throws IOException {
+// String fileId = this.appDeviceAddService.saveFile(file);
+// return fileId != null ? ResponseData.success(fileId) : ResponseData.error("文件为空");
+// }
+
+
+ @RequestMapping({"/fileUpload"})
+ @ResponseBody
+ public Object imageBase64Upload(@RequestBody(required =false) String fileBase64) throws IOException {
+ return ResponseData.success(commonFileService.saveFileBase64Image(fileBase64));
+
+ }
+
+ @RequestMapping({"/getWellTypeList"})
+ @ResponseBody
+ public Object getWellTypeList() {
+ List selectDTOList = new ArrayList<>();
+ List dictList = permissionService.findInDictByCode("sluicewellType");
+ for (Dict dict : dictList) {
+ SelectDTO selectDTO = new SelectDTO();
+ selectDTO.setText(dict.getName());
+ selectDTO.setValue(dict.getCode());
+ selectDTOList.add(selectDTO);
+ }
+ return selectDTOList;
+ }
+
+
+ /**
+ * 按照设备编号查询
+ */
+ @RequestMapping(value = "/findListByCodes")
+ @ResponseBody
+ public Object findListByCodes(String devcodes) {
+ List list = ToolUtil.isNotEmpty(devcodes) ?
+ Arrays.asList(devcodes.split(",")) :
+ new ArrayList() {{
+ add("");
+ }};
+ EntityWrapper query = new EntityWrapper<>();
+ query.in("devcode", list);
+ return ResponseData.success(appDeviceAddService.selectList(query));
+ }
+
+ /**a * 按照设备编号查询
+ */
+ @RequestMapping(value = "/findModeCodeByCode")
+ @ResponseBody
+ public Object findModeCodeByCode(String devcode) {
+ return appDeviceAddService.findModeCodeByCode(devcode);
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index a7733d8..7eb0dbc 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -6,10 +6,13 @@
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.base.response.SuccessResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
import com.casic.missiles.modular.app.service.IAppDeviceLogService;
+import com.casic.missiles.modular.app.util.DateUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -22,12 +25,12 @@
* 施工添加设备控制器
*
* @author dev
- * @Date 2020-05-24 11:21:38
+ * @Date 2020-05-24 11:21:38a
*/
@Controller
@RequestMapping("/appDeviceLog")
public class AppDeviceLogController extends BaseController {
-
+ private static String specialStr = "undefined";
@Resource
private IAppDeviceLogService appDeviceLogService;
@@ -50,10 +53,23 @@
*/
@RequestMapping(value = "/listPage")
@ResponseBody
- public Object listPage(String condition) {
- Page page = new PageFactory().defaultPage();
- EntityWrapper query = new EntityWrapper<>();
- page = appDeviceLogService.selectPage(page, query);
+ public Object listPage(String devcode, String devtype, String installtimeFmt, String project) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ if (ToolUtil.isNotEmpty(devcode) && (!(specialStr.equals(devcode)))) {
+ query.like("devcode", devcode);
+ }
+ if (ToolUtil.isNotEmpty(installtimeFmt) && (!(specialStr.equals(installtimeFmt)))) {
+ query.eq("installtime",DateUtil.parse(installtimeFmt,"yyyy-MM-dd"));
+ }
+ if (ToolUtil.isNotEmpty(project) && (!(specialStr.equals(project)))) {
+ query.eq("project", project);
+ }
+ if (ToolUtil.isNotEmpty(devtype) && (!(specialStr.equals(devtype)))) {
+ query.eq("devicetype", devtype);
+ }
+ query.orderBy("createtime", false);
+ page = appDeviceAddService.selectPage(page, query);
return new SuccessResponseData(super.packForBT(page));
}
@@ -63,11 +79,15 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(AppDeviceLog appDeviceLog) {
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltimeFmt())) {
+ appDeviceLog.setInstalltime(DateUtil.parseDate(appDeviceLog.getInstalltimeFmt()));
+ }
appDeviceLogService.insert(appDeviceLog);
//添加运维日志的同时更新施工日志
List appDeviceAddList =
appDeviceAddService.getAppDevice(appDeviceLog.getDevcode());
- appDeviceAddService.updateBatchById(appDeviceAddList);
+
+ appDeviceAddService.updateBatchById(AppDeviceAdd.convert(appDeviceAddList, appDeviceLog));
return ResponseData.success();
}
@@ -102,4 +122,43 @@
}
+ /**
+ * 获取施工添加设备分页列表
+ */
+ @RequestMapping(value = "/deviceDetail")
+ @ResponseBody
+ public Object deviceDetail(String devcode) {
+ EntityWrapper ew = new EntityWrapper<>();
+ ew.eq("devcode", devcode);
+ AppDeviceAdd appDeviceAdd = appDeviceAddService.selectOne(ew);
+
+ EntityWrapper query = new EntityWrapper<>();
+ query.eq("devcode", devcode);
+ query.orderBy("id", false);
+ List appDeviceLogList = appDeviceLogService.selectList(query);
+ String logs = "";
+ for (AppDeviceLog appDeviceLog : appDeviceLogList) {
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltime())) {
+ appDeviceLog.setInstalltimeFmt(DateUtils.sdf_day.format(appDeviceLog.getInstalltime()));
+ }
+ logs += appDeviceLog.getInstalltimeFmt() + ":" +
+ appDeviceLog.getInstallperson() + "," +
+ appDeviceLog.getDescription() + ";\n";
+ }
+ if (null != appDeviceAdd) {
+ if (ToolUtil.isNotEmpty(appDeviceAdd.getInstalltime())) {
+ appDeviceAdd.setInstalltimeFmt(DateUtils.sdf_day.format(appDeviceAdd.getInstalltime()));
+
+ }
+ appDeviceAdd.setLogs(logs);
+ }
+ if(appDeviceLogList.size()>0){
+ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1());
+ appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2());
+ appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3());
+ }
+ return new SuccessResponseData(appDeviceAdd);
+ }
+
+
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
index 4b9be7a..18f1929 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import org.apache.ibatis.annotations.Param;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +14,6 @@
*/
public interface AppDeviceAddMapper extends BaseMapper {
+ String findModeCodeByCode(@Param("devcode") String devcode);
+
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
index 07ead85..dba6207 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
@@ -1,6 +1,6 @@
-
+
@@ -29,4 +29,11 @@
id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype
+
+
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java
new file mode 100644
index 0000000..5c91b6a
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.app.dto;
+
+public class SelectDTO {
+ private String text;
+ private String value;
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
index 61862b2..1385e2c 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
@@ -2,16 +2,24 @@
import java.io.Serializable;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.ArrayList;
import java.util.Date;
+
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+
import java.io.Serializable;
+import java.util.List;
/**
*
- *
+ *
*
*
* @author stylefeng123
@@ -55,10 +63,21 @@
* 安装时间
*/
private Date installtime;
- /**ap
- * 照片路径
+ /**
+ *
+ * 照片路径1
*/
- private String photopath;
+ private String photopath1;
+ /**
+ *
+ * 照片路径2
+ */
+ private String photopath2;
+ /**
+ *
+ * 照片路径3
+ */
+ private String photopath3;
/**
* 权属单位
*/
@@ -96,6 +115,12 @@
*/
private String devicetype;
+ @TableField(exist = false)
+ private String installtimeFmt;
+
+ @TableField(exist = false)
+ private String logs;
+
public Long getId() {
return id;
@@ -161,13 +186,6 @@
this.installtime = installtime;
}
- public String getPhotopath() {
- return photopath;
- }
-
- public void setPhotopath(String photopath) {
- this.photopath = photopath;
- }
public String getFactory() {
return factory;
@@ -241,6 +259,46 @@
this.devicetype = devicetype;
}
+ public String getInstalltimeFmt() {
+ return installtimeFmt;
+ }
+
+ public void setInstalltimeFmt(String installtimeFmt) {
+ this.installtimeFmt = installtimeFmt;
+ }
+
+ public String getLogs() {
+ return logs;
+ }
+
+ public void setLogs(String logs) {
+ this.logs = logs;
+ }
+
+ public String getPhotopath1() {
+ return photopath1;
+ }
+
+ public void setPhotopath1(String photopath1) {
+ this.photopath1 = photopath1;
+ }
+
+ public String getPhotopath2() {
+ return photopath2;
+ }
+
+ public void setPhotopath2(String photopath2) {
+ this.photopath2 = photopath2;
+ }
+
+ public String getPhotopath3() {
+ return photopath3;
+ }
+
+ public void setPhotopath3(String photopath3) {
+ this.photopath3 = photopath3;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -249,24 +307,62 @@
@Override
public String toString() {
return "AppDeviceAdd{" +
- "id=" + id +
- ", devcode=" + devcode +
- ", wellcode=" + wellcode +
- ", welltype=" + welltype +
- ", welldepth=" + welldepth +
- ", installheigt=" + installheigt +
- ", installperson=" + installperson +
- ", installtime=" + installtime +
- ", photopath=" + photopath +
- ", factory=" + factory +
- ", project=" + project +
- ", workmsg=" + workmsg +
- ", position=" + position +
- ", description=" + description +
- ", createtime=" + createtime +
- ", longitude=" + longitude +
- ", latitude=" + latitude +
- ", devicetype=" + devicetype +
- "}";
+ "id=" + id +
+ ", devcode=" + devcode +
+ ", wellcode=" + wellcode +
+ ", welltype=" + welltype +
+ ", welldepth=" + welldepth +
+ ", installheigt=" + installheigt +
+ ", installperson=" + installperson +
+ ", installtime=" + installtime +
+ ", factory=" + factory +
+ ", project=" + project +
+ ", workmsg=" + workmsg +
+ ", position=" + position +
+ ", description=" + description +
+ ", createtime=" + createtime +
+ ", longitude=" + longitude +
+ ", latitude=" + latitude +
+ ", devicetype=" + devicetype +
+ "}";
+ }
+
+ public AppDeviceAdd() {
+ }
+
+ public static AppDeviceAdd appDeviceLogFormt(AppDeviceAdd appDeviceAdd, AppDeviceLog appDeviceLog) {
+ if (null == appDeviceLog) {
+ return appDeviceAdd;
+ }
+ appDeviceAdd.devcode = appDeviceLog.getDevcode();
+ appDeviceAdd.wellcode = appDeviceLog.getWellcode();
+ appDeviceAdd.welltype = appDeviceLog.getWelltype();
+ appDeviceAdd.welldepth = appDeviceLog.getWelldepth();
+ appDeviceAdd.installheigt = appDeviceLog.getInstallheigt();
+ appDeviceAdd.installperson = appDeviceLog.getInstallperson();
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltimeFmt())) {
+ appDeviceAdd.installtime = (DateUtil.parseDate(appDeviceLog.getInstalltimeFmt()));
+ }
+// appDeviceAdd.photopath = appDeviceLog.getPhotopath();
+ appDeviceAdd.factory = appDeviceLog.getFactory();
+ appDeviceAdd.project = appDeviceLog.getProject();
+ appDeviceAdd.workmsg = appDeviceLog.getWorkmsg();
+ appDeviceAdd.position = appDeviceLog.getPosition();
+ appDeviceAdd.description = appDeviceLog.getDescription();
+ appDeviceAdd.longitude = appDeviceLog.getLongitude();
+ appDeviceAdd.latitude = appDeviceLog.getLatitude();
+ appDeviceAdd.devicetype = appDeviceLog.getDevicetype();
+ appDeviceAdd.createtime = new Date();
+ return appDeviceAdd;
+
+ }
+
+ public static List convert(List appDeviceAdds,
+ AppDeviceLog appDeviceLog) {
+ List appDeviceAddList = new ArrayList<>();
+ for (AppDeviceAdd appDeviceAdd : appDeviceAdds) {
+ appDeviceAddList.add(appDeviceLogFormt(appDeviceAdd, appDeviceLog));
+ }
+ return appDeviceAddList;
}
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
index 1be81fb..2c4a7be 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
@@ -2,11 +2,15 @@
import java.io.Serializable;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+
import java.io.Serializable;
/**
@@ -56,9 +60,20 @@
*/
private Date installtime;
/**
- * 照片路径
+ *
+ * 照片路径1
*/
- private String photopath;
+ private String photopath1;
+ /**
+ *
+ * 照片路径2
+ */
+ private String photopath2;
+ /**
+ *
+ * 照片路径3
+ */
+ private String photopath3;
/**
* 权属单位
*/
@@ -96,6 +111,9 @@
*/
private String devicetype;
+ @TableField(exist = false)
+ private String installtimeFmt;
+
public Long getId() {
return id;
@@ -161,12 +179,28 @@
this.installtime = installtime;
}
- public String getPhotopath() {
- return photopath;
+ public String getPhotopath1() {
+ return photopath1;
}
- public void setPhotopath(String photopath) {
- this.photopath = photopath;
+ public void setPhotopath1(String photopath1) {
+ this.photopath1 = photopath1;
+ }
+
+ public String getPhotopath2() {
+ return photopath2;
+ }
+
+ public void setPhotopath2(String photopath2) {
+ this.photopath2 = photopath2;
+ }
+
+ public String getPhotopath3() {
+ return photopath3;
+ }
+
+ public void setPhotopath3(String photopath3) {
+ this.photopath3 = photopath3;
}
public String getFactory() {
@@ -241,6 +275,14 @@
this.devicetype = devicetype;
}
+ public String getInstalltimeFmt() {
+ return installtimeFmt;
+ }
+
+ public void setInstalltimeFmt(String installtimeFmt) {
+ this.installtimeFmt = installtimeFmt;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -257,7 +299,6 @@
", installheigt=" + installheigt +
", installperson=" + installperson +
", installtime=" + installtime +
- ", photopath=" + photopath +
", factory=" + factory +
", project=" + project +
", workmsg=" + workmsg +
@@ -269,4 +310,32 @@
", devicetype=" + devicetype +
"}";
}
+
+ public AppDeviceLog() {
+ }
+
+ public AppDeviceLog(AppDeviceAdd appDeviceAdd) {
+ this.devcode = appDeviceAdd.getDevcode();
+ this.wellcode = appDeviceAdd.getWellcode();
+ this.welltype = appDeviceAdd.getWelltype();
+ this.welldepth = appDeviceAdd.getWelldepth();
+ this.installheigt = appDeviceAdd.getInstallheigt();
+ this.installperson = appDeviceAdd.getInstallperson();
+ if(ToolUtil.isNotEmpty(appDeviceAdd.getInstalltimeFmt())){
+ this.installtime=(DateUtil.parseDate(appDeviceAdd.getInstalltimeFmt()));
+ }
+// this.photopath = appDeviceAdd.getPhotopath();
+ this.photopath1 = appDeviceAdd.getPhotopath1();
+ this.photopath2 = appDeviceAdd.getPhotopath2();
+ this.photopath3 = appDeviceAdd.getPhotopath3();
+ this.factory = appDeviceAdd.getFactory();
+ this.project = appDeviceAdd.getProject();
+ this.workmsg = appDeviceAdd.getWorkmsg();
+ this.position = appDeviceAdd.getPosition();
+ this.description = appDeviceAdd.getDescription();
+ this.longitude = appDeviceAdd.getLongitude();
+ this.latitude = appDeviceAdd.getLatitude();
+ this.devicetype = appDeviceAdd.getDevicetype();
+
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
index d1aaf2a..d3f2c53 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.service.IService;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.List;
/**
@@ -16,4 +18,6 @@
public interface IAppDeviceAddService extends IService {
List getAppDevice(String devcode);
+ String saveFile(MultipartFile var1) throws IOException;
+ String findModeCodeByCode(String devcode);
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
index c5d7e5a..083caac 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.service.IService;
import com.casic.missiles.modular.app.model.AppDeviceLog;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +15,5 @@
*/
public interface IAppDeviceLogService extends IService {
+ List getListByCode(String devcode);
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
index e6a43b4..5a3ce82 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
@@ -5,9 +5,16 @@
import com.casic.missiles.modular.app.dao.AppDeviceAddMapper;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
/**
*
@@ -20,6 +27,8 @@
@Service
public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService {
+ @Value("${casic.file-download-path}")
+ private String downloadPath;
@Override
public List getAppDevice(String devcode) {
@@ -28,4 +37,28 @@
return selectList(ew);
}
+
+ @Override
+ public String saveFile(MultipartFile file) throws IOException {
+ if (!file.isEmpty()) {
+ String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+ String filePrex = uuid + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+ String fileName = (new SimpleDateFormat("yyyy-MM")).format(new Date());
+ File dir = new File(downloadPath + fileName);
+ if (!dir.exists()) {
+ dir.mkdirs();
+ }
+ String pathName = dir.getPath() + File.separator + filePrex;
+ file.transferTo(new File(pathName));
+// return fileName.concat(File.separator).concat(filePrex);
+ return pathName;
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String findModeCodeByCode(String devcode) {
+ return this.baseMapper.findModeCodeByCode(devcode);
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java
index 50d83e8..22a1665 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java
@@ -1,11 +1,14 @@
package com.casic.missiles.modular.app.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.casic.missiles.modular.app.dao.AppDeviceLogMapper;
import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceLogService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 服务实现类
@@ -17,4 +20,10 @@
@Service
public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService {
+ @Override
+ public List getListByCode(String devcode) {
+ EntityWrapper entityWrapper = new EntityWrapper<>();
+ entityWrapper.eq("devcode",devcode);
+ return this.selectList(entityWrapper);
+ }
}
diff --git a/casic-app/pom.xml b/casic-app/pom.xml
index 9add040..320765b 100644
--- a/casic-app/pom.xml
+++ b/casic-app/pom.xml
@@ -70,6 +70,11 @@
org.apache.commons
commons-lang3
+
+ com.casic
+ casic-file
+ ${casic.version}
+
@@ -79,6 +84,7 @@
**/*.xml
+ true
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 8514576..46c47ee 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -5,17 +5,33 @@
import com.casic.missiles.core.base.controller.BaseController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.core.common.service.ICommonFileService;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.common.service.ICommonUserService;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.app.dto.SelectDTO;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
+import com.casic.missiles.modular.app.service.IAppDeviceLogService;
+import com.casic.missiles.modular.system.model.Dict;
+import com.casic.missiles.service.ICasicFileService;
import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 施工添加设备控制器
@@ -30,7 +46,12 @@
@Resource
private IAppDeviceAddService appDeviceAddService;
-
+ @Resource
+ private IAppDeviceLogService appDeviceLogService;
+ @Resource
+ private ICommonFileService commonFileService;
+ @Resource
+ private ICommonPermissionService permissionService;
/**
* 获取施工添加设备列表
@@ -65,7 +86,13 @@
if (CollectionUtils.isNotEmpty(appDeviceAddList)) {
return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加");
}
+ if (ToolUtil.isNotEmpty(appDeviceAdd.getInstalltimeFmt())) {
+ appDeviceAdd.setInstalltime(DateUtil.parseDate(appDeviceAdd.getInstalltimeFmt()));
+ }
appDeviceAddService.insert(appDeviceAdd);
+ if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
+ appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
+ }
return ResponseData.success();
}
@@ -99,4 +126,57 @@
return ResponseData.success();
}
+// @RequestMapping({"/fileUpload"})
+// @ResponseBody
+// public Object imageUpload(@RequestParam("file") MultipartFile file) throws IOException {
+// String fileId = this.appDeviceAddService.saveFile(file);
+// return fileId != null ? ResponseData.success(fileId) : ResponseData.error("文件为空");
+// }
+
+
+ @RequestMapping({"/fileUpload"})
+ @ResponseBody
+ public Object imageBase64Upload(@RequestBody(required =false) String fileBase64) throws IOException {
+ return ResponseData.success(commonFileService.saveFileBase64Image(fileBase64));
+
+ }
+
+ @RequestMapping({"/getWellTypeList"})
+ @ResponseBody
+ public Object getWellTypeList() {
+ List selectDTOList = new ArrayList<>();
+ List dictList = permissionService.findInDictByCode("sluicewellType");
+ for (Dict dict : dictList) {
+ SelectDTO selectDTO = new SelectDTO();
+ selectDTO.setText(dict.getName());
+ selectDTO.setValue(dict.getCode());
+ selectDTOList.add(selectDTO);
+ }
+ return selectDTOList;
+ }
+
+
+ /**
+ * 按照设备编号查询
+ */
+ @RequestMapping(value = "/findListByCodes")
+ @ResponseBody
+ public Object findListByCodes(String devcodes) {
+ List list = ToolUtil.isNotEmpty(devcodes) ?
+ Arrays.asList(devcodes.split(",")) :
+ new ArrayList() {{
+ add("");
+ }};
+ EntityWrapper query = new EntityWrapper<>();
+ query.in("devcode", list);
+ return ResponseData.success(appDeviceAddService.selectList(query));
+ }
+
+ /**a * 按照设备编号查询
+ */
+ @RequestMapping(value = "/findModeCodeByCode")
+ @ResponseBody
+ public Object findModeCodeByCode(String devcode) {
+ return appDeviceAddService.findModeCodeByCode(devcode);
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index a7733d8..7eb0dbc 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -6,10 +6,13 @@
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.base.response.SuccessResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
import com.casic.missiles.modular.app.service.IAppDeviceLogService;
+import com.casic.missiles.modular.app.util.DateUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -22,12 +25,12 @@
* 施工添加设备控制器
*
* @author dev
- * @Date 2020-05-24 11:21:38
+ * @Date 2020-05-24 11:21:38a
*/
@Controller
@RequestMapping("/appDeviceLog")
public class AppDeviceLogController extends BaseController {
-
+ private static String specialStr = "undefined";
@Resource
private IAppDeviceLogService appDeviceLogService;
@@ -50,10 +53,23 @@
*/
@RequestMapping(value = "/listPage")
@ResponseBody
- public Object listPage(String condition) {
- Page page = new PageFactory().defaultPage();
- EntityWrapper query = new EntityWrapper<>();
- page = appDeviceLogService.selectPage(page, query);
+ public Object listPage(String devcode, String devtype, String installtimeFmt, String project) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ if (ToolUtil.isNotEmpty(devcode) && (!(specialStr.equals(devcode)))) {
+ query.like("devcode", devcode);
+ }
+ if (ToolUtil.isNotEmpty(installtimeFmt) && (!(specialStr.equals(installtimeFmt)))) {
+ query.eq("installtime",DateUtil.parse(installtimeFmt,"yyyy-MM-dd"));
+ }
+ if (ToolUtil.isNotEmpty(project) && (!(specialStr.equals(project)))) {
+ query.eq("project", project);
+ }
+ if (ToolUtil.isNotEmpty(devtype) && (!(specialStr.equals(devtype)))) {
+ query.eq("devicetype", devtype);
+ }
+ query.orderBy("createtime", false);
+ page = appDeviceAddService.selectPage(page, query);
return new SuccessResponseData(super.packForBT(page));
}
@@ -63,11 +79,15 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(AppDeviceLog appDeviceLog) {
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltimeFmt())) {
+ appDeviceLog.setInstalltime(DateUtil.parseDate(appDeviceLog.getInstalltimeFmt()));
+ }
appDeviceLogService.insert(appDeviceLog);
//添加运维日志的同时更新施工日志
List appDeviceAddList =
appDeviceAddService.getAppDevice(appDeviceLog.getDevcode());
- appDeviceAddService.updateBatchById(appDeviceAddList);
+
+ appDeviceAddService.updateBatchById(AppDeviceAdd.convert(appDeviceAddList, appDeviceLog));
return ResponseData.success();
}
@@ -102,4 +122,43 @@
}
+ /**
+ * 获取施工添加设备分页列表
+ */
+ @RequestMapping(value = "/deviceDetail")
+ @ResponseBody
+ public Object deviceDetail(String devcode) {
+ EntityWrapper ew = new EntityWrapper<>();
+ ew.eq("devcode", devcode);
+ AppDeviceAdd appDeviceAdd = appDeviceAddService.selectOne(ew);
+
+ EntityWrapper query = new EntityWrapper<>();
+ query.eq("devcode", devcode);
+ query.orderBy("id", false);
+ List appDeviceLogList = appDeviceLogService.selectList(query);
+ String logs = "";
+ for (AppDeviceLog appDeviceLog : appDeviceLogList) {
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltime())) {
+ appDeviceLog.setInstalltimeFmt(DateUtils.sdf_day.format(appDeviceLog.getInstalltime()));
+ }
+ logs += appDeviceLog.getInstalltimeFmt() + ":" +
+ appDeviceLog.getInstallperson() + "," +
+ appDeviceLog.getDescription() + ";\n";
+ }
+ if (null != appDeviceAdd) {
+ if (ToolUtil.isNotEmpty(appDeviceAdd.getInstalltime())) {
+ appDeviceAdd.setInstalltimeFmt(DateUtils.sdf_day.format(appDeviceAdd.getInstalltime()));
+
+ }
+ appDeviceAdd.setLogs(logs);
+ }
+ if(appDeviceLogList.size()>0){
+ appDeviceAdd.setPhotopath1(appDeviceLogList.get(0).getPhotopath1());
+ appDeviceAdd.setPhotopath2(appDeviceLogList.get(0).getPhotopath2());
+ appDeviceAdd.setPhotopath3(appDeviceLogList.get(0).getPhotopath3());
+ }
+ return new SuccessResponseData(appDeviceAdd);
+ }
+
+
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
index 4b9be7a..18f1929 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import org.apache.ibatis.annotations.Param;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author stylefeng123
@@ -13,4 +14,6 @@
*/
public interface AppDeviceAddMapper extends BaseMapper {
+ String findModeCodeByCode(@Param("devcode") String devcode);
+
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
index 07ead85..dba6207 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
@@ -1,6 +1,6 @@
-
+
@@ -29,4 +29,11 @@
id, devcode, wellcode, welltype, welldepth, installheigt, installperson, installtime, photopath, factory, project, workmsg, position, description, createtime, longitude, latitude, devicetype
+
+
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java
new file mode 100644
index 0000000..5c91b6a
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SelectDTO.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.modular.app.dto;
+
+public class SelectDTO {
+ private String text;
+ private String value;
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
index 61862b2..1385e2c 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
@@ -2,16 +2,24 @@
import java.io.Serializable;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.ArrayList;
import java.util.Date;
+
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+
import java.io.Serializable;
+import java.util.List;
/**
*
- *
+ *
*
*
* @author stylefeng123
@@ -55,10 +63,21 @@
* 安装时间
*/
private Date installtime;
- /**ap
- * 照片路径
+ /**
+ *
+ * 照片路径1
*/
- private String photopath;
+ private String photopath1;
+ /**
+ *
+ * 照片路径2
+ */
+ private String photopath2;
+ /**
+ *
+ * 照片路径3
+ */
+ private String photopath3;
/**
* 权属单位
*/
@@ -96,6 +115,12 @@
*/
private String devicetype;
+ @TableField(exist = false)
+ private String installtimeFmt;
+
+ @TableField(exist = false)
+ private String logs;
+
public Long getId() {
return id;
@@ -161,13 +186,6 @@
this.installtime = installtime;
}
- public String getPhotopath() {
- return photopath;
- }
-
- public void setPhotopath(String photopath) {
- this.photopath = photopath;
- }
public String getFactory() {
return factory;
@@ -241,6 +259,46 @@
this.devicetype = devicetype;
}
+ public String getInstalltimeFmt() {
+ return installtimeFmt;
+ }
+
+ public void setInstalltimeFmt(String installtimeFmt) {
+ this.installtimeFmt = installtimeFmt;
+ }
+
+ public String getLogs() {
+ return logs;
+ }
+
+ public void setLogs(String logs) {
+ this.logs = logs;
+ }
+
+ public String getPhotopath1() {
+ return photopath1;
+ }
+
+ public void setPhotopath1(String photopath1) {
+ this.photopath1 = photopath1;
+ }
+
+ public String getPhotopath2() {
+ return photopath2;
+ }
+
+ public void setPhotopath2(String photopath2) {
+ this.photopath2 = photopath2;
+ }
+
+ public String getPhotopath3() {
+ return photopath3;
+ }
+
+ public void setPhotopath3(String photopath3) {
+ this.photopath3 = photopath3;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -249,24 +307,62 @@
@Override
public String toString() {
return "AppDeviceAdd{" +
- "id=" + id +
- ", devcode=" + devcode +
- ", wellcode=" + wellcode +
- ", welltype=" + welltype +
- ", welldepth=" + welldepth +
- ", installheigt=" + installheigt +
- ", installperson=" + installperson +
- ", installtime=" + installtime +
- ", photopath=" + photopath +
- ", factory=" + factory +
- ", project=" + project +
- ", workmsg=" + workmsg +
- ", position=" + position +
- ", description=" + description +
- ", createtime=" + createtime +
- ", longitude=" + longitude +
- ", latitude=" + latitude +
- ", devicetype=" + devicetype +
- "}";
+ "id=" + id +
+ ", devcode=" + devcode +
+ ", wellcode=" + wellcode +
+ ", welltype=" + welltype +
+ ", welldepth=" + welldepth +
+ ", installheigt=" + installheigt +
+ ", installperson=" + installperson +
+ ", installtime=" + installtime +
+ ", factory=" + factory +
+ ", project=" + project +
+ ", workmsg=" + workmsg +
+ ", position=" + position +
+ ", description=" + description +
+ ", createtime=" + createtime +
+ ", longitude=" + longitude +
+ ", latitude=" + latitude +
+ ", devicetype=" + devicetype +
+ "}";
+ }
+
+ public AppDeviceAdd() {
+ }
+
+ public static AppDeviceAdd appDeviceLogFormt(AppDeviceAdd appDeviceAdd, AppDeviceLog appDeviceLog) {
+ if (null == appDeviceLog) {
+ return appDeviceAdd;
+ }
+ appDeviceAdd.devcode = appDeviceLog.getDevcode();
+ appDeviceAdd.wellcode = appDeviceLog.getWellcode();
+ appDeviceAdd.welltype = appDeviceLog.getWelltype();
+ appDeviceAdd.welldepth = appDeviceLog.getWelldepth();
+ appDeviceAdd.installheigt = appDeviceLog.getInstallheigt();
+ appDeviceAdd.installperson = appDeviceLog.getInstallperson();
+ if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltimeFmt())) {
+ appDeviceAdd.installtime = (DateUtil.parseDate(appDeviceLog.getInstalltimeFmt()));
+ }
+// appDeviceAdd.photopath = appDeviceLog.getPhotopath();
+ appDeviceAdd.factory = appDeviceLog.getFactory();
+ appDeviceAdd.project = appDeviceLog.getProject();
+ appDeviceAdd.workmsg = appDeviceLog.getWorkmsg();
+ appDeviceAdd.position = appDeviceLog.getPosition();
+ appDeviceAdd.description = appDeviceLog.getDescription();
+ appDeviceAdd.longitude = appDeviceLog.getLongitude();
+ appDeviceAdd.latitude = appDeviceLog.getLatitude();
+ appDeviceAdd.devicetype = appDeviceLog.getDevicetype();
+ appDeviceAdd.createtime = new Date();
+ return appDeviceAdd;
+
+ }
+
+ public static List convert(List appDeviceAdds,
+ AppDeviceLog appDeviceLog) {
+ List appDeviceAddList = new ArrayList<>();
+ for (AppDeviceAdd appDeviceAdd : appDeviceAdds) {
+ appDeviceAddList.add(appDeviceLogFormt(appDeviceAdd, appDeviceLog));
+ }
+ return appDeviceAddList;
}
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
index 1be81fb..2c4a7be 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
@@ -2,11 +2,15 @@
import java.io.Serializable;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+
import java.io.Serializable;
/**
@@ -56,9 +60,20 @@
*/
private Date installtime;
/**
- * 照片路径
+ *
+ * 照片路径1
*/
- private String photopath;
+ private String photopath1;
+ /**
+ *
+ * 照片路径2
+ */
+ private String photopath2;
+ /**
+ *
+ * 照片路径3
+ */
+ private String photopath3;
/**
* 权属单位
*/
@@ -96,6 +111,9 @@
*/
private String devicetype;
+ @TableField(exist = false)
+ private String installtimeFmt;
+
public Long getId() {
return id;
@@ -161,12 +179,28 @@
this.installtime = installtime;
}
- public String getPhotopath() {
- return photopath;
+ public String getPhotopath1() {
+ return photopath1;
}
- public void setPhotopath(String photopath) {
- this.photopath = photopath;
+ public void setPhotopath1(String photopath1) {
+ this.photopath1 = photopath1;
+ }
+
+ public String getPhotopath2() {
+ return photopath2;
+ }
+
+ public void setPhotopath2(String photopath2) {
+ this.photopath2 = photopath2;
+ }
+
+ public String getPhotopath3() {
+ return photopath3;
+ }
+
+ public void setPhotopath3(String photopath3) {
+ this.photopath3 = photopath3;
}
public String getFactory() {
@@ -241,6 +275,14 @@
this.devicetype = devicetype;
}
+ public String getInstalltimeFmt() {
+ return installtimeFmt;
+ }
+
+ public void setInstalltimeFmt(String installtimeFmt) {
+ this.installtimeFmt = installtimeFmt;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -257,7 +299,6 @@
", installheigt=" + installheigt +
", installperson=" + installperson +
", installtime=" + installtime +
- ", photopath=" + photopath +
", factory=" + factory +
", project=" + project +
", workmsg=" + workmsg +
@@ -269,4 +310,32 @@
", devicetype=" + devicetype +
"}";
}
+
+ public AppDeviceLog() {
+ }
+
+ public AppDeviceLog(AppDeviceAdd appDeviceAdd) {
+ this.devcode = appDeviceAdd.getDevcode();
+ this.wellcode = appDeviceAdd.getWellcode();
+ this.welltype = appDeviceAdd.getWelltype();
+ this.welldepth = appDeviceAdd.getWelldepth();
+ this.installheigt = appDeviceAdd.getInstallheigt();
+ this.installperson = appDeviceAdd.getInstallperson();
+ if(ToolUtil.isNotEmpty(appDeviceAdd.getInstalltimeFmt())){
+ this.installtime=(DateUtil.parseDate(appDeviceAdd.getInstalltimeFmt()));
+ }
+// this.photopath = appDeviceAdd.getPhotopath();
+ this.photopath1 = appDeviceAdd.getPhotopath1();
+ this.photopath2 = appDeviceAdd.getPhotopath2();
+ this.photopath3 = appDeviceAdd.getPhotopath3();
+ this.factory = appDeviceAdd.getFactory();
+ this.project = appDeviceAdd.getProject();
+ this.workmsg = appDeviceAdd.getWorkmsg();
+ this.position = appDeviceAdd.getPosition();
+ this.description = appDeviceAdd.getDescription();
+ this.longitude = appDeviceAdd.getLongitude();
+ this.latitude = appDeviceAdd.getLatitude();
+ this.devicetype = appDeviceAdd.getDevicetype();
+
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
index d1aaf2a..d3f2c53 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.service.IService;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.List;
/**
@@ -16,4 +18,6 @@
public interface IAppDeviceAddService extends IService {
List getAppDevice(String devcode);
+ String saveFile(MultipartFile var1) throws IOException;
+ String findModeCodeByCode(String devcode);
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
index c5d7e5a..083caac 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceLogService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.service.IService;
import com.casic.missiles.modular.app.model.AppDeviceLog;
+import java.util.List;
+
/**
*
* 服务类
@@ -13,4 +15,5 @@
*/
public interface IAppDeviceLogService extends IService {
+ List getListByCode(String devcode);
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
index e6a43b4..5a3ce82 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
@@ -5,9 +5,16 @@
import com.casic.missiles.modular.app.dao.AppDeviceAddMapper;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
/**
*
@@ -20,6 +27,8 @@
@Service
public class AppDeviceAddServiceImpl extends ServiceImpl implements IAppDeviceAddService {
+ @Value("${casic.file-download-path}")
+ private String downloadPath;
@Override
public List getAppDevice(String devcode) {
@@ -28,4 +37,28 @@
return selectList(ew);
}
+
+ @Override
+ public String saveFile(MultipartFile file) throws IOException {
+ if (!file.isEmpty()) {
+ String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+ String filePrex = uuid + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+ String fileName = (new SimpleDateFormat("yyyy-MM")).format(new Date());
+ File dir = new File(downloadPath + fileName);
+ if (!dir.exists()) {
+ dir.mkdirs();
+ }
+ String pathName = dir.getPath() + File.separator + filePrex;
+ file.transferTo(new File(pathName));
+// return fileName.concat(File.separator).concat(filePrex);
+ return pathName;
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String findModeCodeByCode(String devcode) {
+ return this.baseMapper.findModeCodeByCode(devcode);
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java
index 50d83e8..22a1665 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceLogServiceImpl.java
@@ -1,11 +1,14 @@
package com.casic.missiles.modular.app.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.casic.missiles.modular.app.dao.AppDeviceLogMapper;
import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceLogService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 服务实现类
@@ -17,4 +20,10 @@
@Service
public class AppDeviceLogServiceImpl extends ServiceImpl implements IAppDeviceLogService {
+ @Override
+ public List getListByCode(String devcode) {
+ EntityWrapper entityWrapper = new EntityWrapper<>();
+ entityWrapper.eq("devcode",devcode);
+ return this.selectList(entityWrapper);
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/util/DateUtils.java b/casic-app/src/main/java/com/casic/missiles/modular/app/util/DateUtils.java
new file mode 100644
index 0000000..852d420
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/util/DateUtils.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.modular.app.util;
+
+import java.text.SimpleDateFormat;
+
+/**
+ * Created by Administrator on 2015/2/25.
+ */
+public class DateUtils {
+ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd");
+ public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss");
+ public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ public static final SimpleDateFormat sdf5 = new SimpleDateFormat("HH:mm:ss");
+
+ public static String DateFormat(String dataString) {
+
+ String strymd = dataString.substring(0, 8);
+ String str1 = strymd.substring(0, 4) + "-" + strymd.substring(4, 6) + "-" + strymd.substring(6, 8) + " ";
+ String strhms = dataString.substring(8);
+ String str2 =strhms.substring(0,2)+":"+strhms.substring(2,4)+":"+strhms.substring(4,6);
+ dataString =str1+str2;
+ return dataString;
+ }
+}
diff --git a/casic-app/pom.xml b/casic-app/pom.xml
index 9add040..320765b 100644
--- a/casic-app/pom.xml
+++ b/casic-app/pom.xml
@@ -70,6 +70,11 @@
org.apache.commons
commons-lang3
+
+ com.casic
+ casic-file
+ ${casic.version}
+
@@ -79,6 +84,7 @@
**/*.xml
+ true
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 8514576..46c47ee 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -5,17 +5,33 @@
import com.casic.missiles.core.base.controller.BaseController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.core.common.service.ICommonFileService;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
+import com.casic.missiles.core.common.service.ICommonUserService;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.app.dto.SelectDTO;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
+import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
+import com.casic.missiles.modular.app.service.IAppDeviceLogService;
+import com.casic.missiles.modular.system.model.Dict;
+import com.casic.missiles.service.ICasicFileService;
import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 施工添加设备控制器
@@ -30,7 +46,12 @@
@Resource
private IAppDeviceAddService appDeviceAddService;
-
+ @Resource
+ private IAppDeviceLogService appDeviceLogService;
+ @Resource
+ private ICommonFileService commonFileService;
+ @Resource
+ private ICommonPermissionService permissionService;
/**
* 获取施工添加设备列表
@@ -65,7 +86,13 @@
if (CollectionUtils.isNotEmpty(appDeviceAddList)) {
return ResponseData.error("设备编号:" + appDeviceAdd.getDevcode() + "已添加");
}
+ if (ToolUtil.isNotEmpty(appDeviceAdd.getInstalltimeFmt())) {
+ appDeviceAdd.setInstalltime(DateUtil.parseDate(appDeviceAdd.getInstalltimeFmt()));
+ }
appDeviceAddService.insert(appDeviceAdd);
+ if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
+ appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
+ }
return ResponseData.success();
}
@@ -99,4 +126,57 @@
return ResponseData.success();
}
+// @RequestMapping({"/fileUpload"})
+// @ResponseBody
+// public Object imageUpload(@RequestParam("file") MultipartFile file) throws IOException {
+// String fileId = this.appDeviceAddService.saveFile(file);
+// return fileId != null ? ResponseData.success(fileId) : ResponseData.error("文件为空");
+// }
+
+
+ @RequestMapping({"/fileUpload"})
+ @ResponseBody
+ public Object imageBase64Upload(@RequestBody(required =false) String fileBase64) throws IOException {
+ return ResponseData.success(commonFileService.saveFileBase64Image(fileBase64));
+
+ }
+
+ @RequestMapping({"/getWellTypeList"})
+ @ResponseBody
+ public Object getWellTypeList() {
+ List selectDTOList = new ArrayList<>();
+ List dictList = permissionService.findInDictByCode("sluicewellType");
+ for (Dict dict : dictList) {
+ SelectDTO selectDTO = new SelectDTO();
+ selectDTO.setText(dict.getName());
+ selectDTO.setValue(dict.getCode());
+ selectDTOList.add(selectDTO);
+ }
+ return selectDTOList;
+ }
+
+
+ /**
+ * 按照设备编号查询
+ */
+ @RequestMapping(value = "/findListByCodes")
+ @ResponseBody
+ public Object findListByCodes(String devcodes) {
+ List list = ToolUtil.isNotEmpty(devcodes) ?
+ Arrays.asList(devcodes.split(",")) :
+ new ArrayList() {{
+ add("");
+ }};
+ EntityWrapper query = new EntityWrapper<>();
+ query.in("devcode", list);
+ return ResponseData.success(appDeviceAddService.selectList(query));
+ }
+
+ /**a * 按照设备编号查询
+ */
+ @RequestMapping(value = "/findModeCodeByCode")
+ @ResponseBody
+ public Object findModeCodeByCode(String devcode) {
+ return appDeviceAddService.findModeCodeByCode(devcode);
+ }
}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index a7733d8..7eb0dbc 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -6,10 +6,13 @@
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.base.response.SuccessResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.core.util.DateUtil;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.app.model.AppDeviceAdd;
import com.casic.missiles.modular.app.model.AppDeviceLog;
import com.casic.missiles.modular.app.service.IAppDeviceAddService;
import com.casic.missiles.modular.app.service.IAppDeviceLogService;
+import com.casic.missiles.modular.app.util.DateUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -22,12 +25,12 @@
* 施工添加设备控制器
*
* @author dev
- * @Date 2020-05-24 11:21:38
+ * @Date 2020-05-24 11:21:38a
*/
@Controller
@RequestMapping("/appDeviceLog")
public class AppDeviceLogController extends BaseController {
-
+ private static String specialStr = "undefined";
@Resource
private IAppDeviceLogService appDeviceLogService;
@@ -50,10 +53,23 @@
*/
@RequestMapping(value = "/listPage")
@ResponseBody
- public Object listPage(String condition) {
- Page