From b7f3f1ed8d3311e3b7aa99731ced6745cc3413b4 Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期五, 17 五月 2024 11:57:23 +0800
Subject: [PATCH] 整理进出库管理功能
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html | 6
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html | 6
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java | 96 +++++++++++++
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml | 12 +
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/RecordType.java | 106 +++++++++++++++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html | 18 --
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/CityConst.java | 44 ++++++
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java | 14 +
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html | 59 ++++++--
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html | 6
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java | 23 ++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html | 12 +
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java | 7 +
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html | 6
14 files changed, 365 insertions(+), 50 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
index 10cc8a0..94af662 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java
@@ -6,11 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import com.javaweb.common.annotation.Log;
import com.javaweb.common.enums.BusinessType;
import com.javaweb.geo.domain.DeviceLog;
@@ -19,6 +15,7 @@
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.poi.ExcelUtil;
import com.javaweb.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
/**
* 璁惧鍑哄叆搴撹褰旵ontroller
@@ -70,7 +67,8 @@
* 鏂板璁惧鍑哄叆搴撹褰�
*/
@GetMapping("/add")
- public String add() {
+ public String add(String projectId, ModelMap mmap) {
+ mmap.put("projectId", projectId);
return prefix + "/add";
}
@@ -116,4 +114,17 @@
public AjaxResult remove(String ids) {
return toAjax(deviceLogService.deleteDeviceLogByIds(ids));
}
+
+
+ /**
+ * 瀵煎叆璁惧鍑哄叆搴撹褰�
+ */
+ @RequiresPermissions("geo:deviceLog:import")
+ @Log(title = "瀵煎叆璁惧鍑哄叆搴撹褰�")
+ @PostMapping( "/importDeviceLog/{projectId}")
+ @ResponseBody
+ public AjaxResult importDeviceLog(@PathVariable("projectId") String projectId, @RequestParam("file") MultipartFile file, boolean updateSupport) throws Exception{
+ String message = deviceLogService.importDeviceLog(projectId,file,updateSupport);
+ return AjaxResult.success(message);
+ }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
index fa47aca..5b674b3 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
@@ -33,6 +33,9 @@
/** 璁惧id */
private String deviceId;
+ /** 璁惧缂栫爜 */
+ private String deviceCode;
+
/** 璁惧鍚嶇О */
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
@@ -110,7 +113,15 @@
this.deviceName = deviceName;
}
- public String getDeviceName()
+ public String getDeviceCode() {
+ return deviceCode;
+ }
+
+ public void setDeviceCode(String deviceCode) {
+ this.deviceCode = deviceCode;
+ }
+
+ public String getDeviceName()
{
return deviceName;
}
@@ -177,6 +188,7 @@
.append("projectId", getProjectId())
.append("projectName", getProjectName())
.append("deviceId", getDeviceId())
+ .append("deviceCode", getDeviceCode())
.append("deviceName", getDeviceName())
.append("type", getType())
.append("transactionDate", getTransactionDate())
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/CityConst.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/CityConst.java
new file mode 100644
index 0000000..f7f774d
--- /dev/null
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/CityConst.java
@@ -0,0 +1,44 @@
+package com.javaweb.geo.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CityConst {
+
+ private static Map<Integer,String> cityMap = new HashMap<Integer, String>();
+
+ static{
+ cityMap.put(1, "涓滃煄鍖�");
+ cityMap.put(2, "瑗垮煄鍖�");
+ cityMap.put(5, "鏈濋槼鍖�");
+ cityMap.put(6, "涓板彴鍖�");
+ cityMap.put(7, "鐭虫櫙灞�");
+
+ cityMap.put(8, "娴锋穩鍖�");
+ cityMap.put(9, "闂ㄥご娌熷尯");
+
+ cityMap.put(10, "鎴垮北鍖�");
+
+ cityMap.put(11, "閫氬窞鍖�");
+
+ cityMap.put(12, "椤轰箟鍖�");
+
+ cityMap.put(13, "鏄屽钩鍖�");
+ cityMap.put(14, "澶у叴鍖�");
+ cityMap.put(15, "鎬�鏌斿尯");
+ cityMap.put(16, "骞宠胺鍖�");
+ cityMap.put(17, "瀵嗕簯鍘�");
+ cityMap.put(18, "寤跺簡鍘�");
+ cityMap.put(99, "澶栧煚");
+
+ }
+
+ public static String getCitName(Integer key){
+
+ if(key != null && cityMap.containsKey(key)){
+ return cityMap.get(key);
+ }
+ return null;
+
+ }
+}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/RecordType.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/RecordType.java
new file mode 100644
index 0000000..47780ca
--- /dev/null
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/enums/RecordType.java
@@ -0,0 +1,106 @@
+package com.javaweb.geo.enums;
+
+public enum RecordType {
+
+ /**
+ * 鍑哄叆搴撶姸鎬�
+ */
+ deviceLog_in("in","鍏ュ簱"),
+ deviceLog_out("out","鍑哄簱"),
+
+ /**
+ * 璁板綍鍒嗙被锛堝繀濉紝鐩存帴濉啓姹夊瓧锛屽洜鑰冭檻鍘嗗彶鏁版嵁鍘熷洜锛�
+ * 鈥滄満闀库�濊〃绀哄徃閽诲憳锛�
+ * 鍥炴銆佸博鍦熴�佸彇鍦熴�佹爣璐�佸姩鎺€�佹按浣嶃�佸彇姘淬�佽礋璐ｄ汉銆佸伐绋嬪笀銆佹満闀裤�侀捇鏈�
+ */
+ hc("鍥炴","鍥炴"),
+ yt("宀╁湡","宀╁湡"),
+ qt("鍙栧湡","鍙栧湡"),
+ bg("鏍囪疮","鏍囪疮"),
+ dt("鍔ㄦ帰","鍔ㄦ帰"),
+ sw("姘翠綅","姘翠綅"),
+ qs("鍙栨按","鍙栨按"),
+ fzr("璐熻矗浜�","璐熻矗浜�"),
+ gcs("宸ョ▼甯�","宸ョ▼甯�"),
+ jz("鏈洪暱","鏈洪暱"),
+ zj("閽绘満","閽绘満"),
+
+
+
+ /**
+ * 椤圭洰鐘舵��
+ */
+ projectStatus0("0","椤圭洰鏈畬鎴�"),
+ projectStatus1("1","椤圭洰楠屾敹瀹屾垚"),
+
+ /**
+ * 鏄惁鍒犻櫎
+ */
+ isDelete0("0","鏈垹闄�"),
+ isDelete1("1","宸插垹闄�"),
+
+ /**
+ * 鍕樻帰鐐圭姸鎬� 1-楠屾敹閫氳繃锛�2-楠屾敹涓嶉�氳繃锛�3-搴熷瓟
+ */
+ holeStatus1("1","楠屾敹閫氳繃"),
+ holeStatus2("2","楠屾敹涓嶉�氳繃"),
+ holeStatus3("3","搴熷瓟");
+
+
+ private String id ;
+ private String name ;
+
+ RecordType(String id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * 鏍规嵁id鑾峰彇name
+ */
+ public static String getValueByKey(String id) {
+ RecordType[] recordTypes = values();
+ for (RecordType item: recordTypes) {
+ if (item.getId().equals(id)) {
+ return item.getName();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鏍规嵁name鑾峰彇id
+ */
+ public static String getKeyByName(String name) {
+ RecordType[] recordTypes = values();
+ for (RecordType item: recordTypes) {
+ if (item.getName().equals(name)) {
+ return item.getId();
+ }
+ }
+ return null;
+ }
+
+ public static void main(String[] args) {
+ String valueByKey = RecordType.getKeyByName("姘存枃-姘存枃娴嬩簳");
+ System.out.println(valueByKey);
+
+ }
+
+}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java
index 1d28b72..1f32791 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java
@@ -1,6 +1,8 @@
package com.javaweb.geo.service;
import com.javaweb.geo.domain.DeviceLog;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -58,4 +60,9 @@
* @return 缁撴灉
*/
public int deleteDeviceLogById(String id);
+
+ /**
+ * 瀵煎叆璁惧鍑哄叆搴撹褰�
+ */
+ String importDeviceLog(String projectId, MultipartFile file, boolean updateSupport);
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
index ee49ede..f958545 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
@@ -1,9 +1,18 @@
package com.javaweb.geo.service.impl;
+import java.io.File;
import java.util.List;
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.javaweb.common.config.Global;
import com.javaweb.common.utils.DateUtils;
import com.javaweb.common.utils.IdGenerate;
+import com.javaweb.geo.domain.Device;
+import com.javaweb.geo.domain.Project;
+import com.javaweb.geo.enums.RecordType;
+import com.javaweb.geo.service.IDeviceService;
+import com.javaweb.geo.service.IProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.javaweb.geo.mapper.DeviceLogMapper;
@@ -11,6 +20,7 @@
import com.javaweb.geo.service.IDeviceLogService;
import com.javaweb.common.core.text.Convert;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
import tk.mybatis.mapper.genid.GenIdUtil;
/**
@@ -21,8 +31,17 @@
*/
@Service
public class DeviceLogServiceImpl implements IDeviceLogService {
+
@Autowired
private DeviceLogMapper deviceLogMapper;
+
+ @Autowired
+ private IProjectService projectService;
+
+ @Autowired
+ private IDeviceService deviceService;
+
+ private String fileSaveDir = Global.getProfile() + "\\template\\" ;
/**
* 鏌ヨ璁惧鍑哄叆搴撹褰�
@@ -57,7 +76,7 @@
if(ObjectUtils.isEmpty(deviceLog.getId())){
deviceLog.setId(IdGenerate.nextId());
}
- deviceLog.setCreateTime(DateUtils.getNowDate());
+ deviceLog.setCreateDate(DateUtils.getNowDate());
return deviceLogMapper.insertDeviceLog(deviceLog);
}
@@ -93,4 +112,79 @@
public int deleteDeviceLogById(String id) {
return deviceLogMapper.deleteDeviceLogById(id);
}
+
+
+ /**
+ * 瀵煎叆璁惧鍑哄叆搴撹褰�
+ */
+ @Override
+ public String importDeviceLog(String projectId,MultipartFile file, boolean updateSupport) {
+ // 鍏宠仈椤圭洰淇℃伅
+ Project project = projectService.selectProjectById(projectId);
+
+ try {
+ String dest = saveExcel(file);
+ List<DeviceLog> list = readData(dest);
+ for (DeviceLog item : list) {
+ // 杞崲椤圭洰淇℃伅
+ item.setProjectId(projectId);
+ item.setProjectName(project.getFullName());
+
+ // 杞崲鍑哄叆搴撶被鍨�
+ String proTypeCode = RecordType.getKeyByName(item.getType());
+ item.setType(proTypeCode);
+
+ // 杞崲璁惧缂栫爜
+ String deviceCode = item.getDeviceCode();
+ if (!ObjectUtils.isEmpty(deviceCode)){
+ Device param = new Device();
+ param.setCode(deviceCode);
+ List<Device> devices = deviceService.selectDeviceList(param);
+ if (!ObjectUtils.isEmpty(devices)){
+ Device device = devices.get(0);
+ item.setDeviceId(device.getId());
+ item.setDeviceCode(device.getCode());
+ item.setDeviceName(device.getName());
+ }
+ }
+
+ item.setCreateDate(DateUtils.getNowDate());
+ insertDeviceLog(item);
+ }
+ } catch (Exception e) {
+ return e.toString();
+ }
+ return "瀵煎叆瀹屾瘯" ;
+ }
+
+ private String saveExcel(MultipartFile file) {
+ String filename = file.getOriginalFilename();
+ File dir = new File(fileSaveDir);
+ if (!dir.exists()) {
+ dir.mkdir();
+ }
+ String addr = fileSaveDir + filename;
+ try {
+ File dest = new File(addr);
+ file.transferTo(dest);
+ } catch (Exception e) {
+ return null;
+ }
+ return addr;
+ }
+
+ private List<DeviceLog> readData(String filepath) {
+ ExcelReader reader = ExcelUtil.getReader(filepath, 0);
+ reader.addHeaderAlias("鍑哄叆搴撳崟瀛愬彿", "code");
+ reader.addHeaderAlias("璁惧缂栫爜", "deviceCode");
+ reader.addHeaderAlias("鍑哄叆搴撶被鍨�", "type");
+ reader.addHeaderAlias("鍑哄叆搴撴椂闂�", "transactionDate");
+ reader.addHeaderAlias("缁忓姙浜�", "optUser");
+ reader.addHeaderAlias("浣跨敤浜�", "applyUser");
+ reader.addHeaderAlias("鍑哄叆搴撴暟閲�", "number");
+ reader.addHeaderAlias("澶囨敞", "remark");
+
+ List<DeviceLog> list = reader.readAll(DeviceLog.class);
+ return list;
+ }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
index 4313582..fc033af 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml
@@ -10,6 +10,7 @@
<result property="projectId" column="project_id" />
<result property="projectName" column="project_name" />
<result property="deviceId" column="device_id" />
+ <result property="deviceCode" column="device_code" />
<result property="deviceName" column="device_name" />
<result property="type" column="type" />
<result property="transactionDate" column="transaction_date" />
@@ -21,21 +22,23 @@
</resultMap>
<sql id="selectDeviceLogVo">
- select id, code, project_id, project_name, device_id, device_name, type, transaction_date, opt_user, apply_user, number, create_date, remark from js_device_log
+ select id, code, project_id, project_name, device_id, device_code, device_name, type, transaction_date, opt_user, apply_user, number, create_date, remark from js_device_log
</sql>
<select id="selectDeviceLogList" parameterType="DeviceLog" resultMap="DeviceLogResult">
<include refid="selectDeviceLogVo"/>
<where>
- <if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if>
- <if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="code != null and code != ''"> and code = #{code}</if>
+ <if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+ <if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
+ <if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="optUser != null and optUser != ''"> and opt_user = #{optUser}</if>
<if test="applyUser != null and applyUser != ''"> and apply_user = #{applyUser}</if>
</where>
+ ORDER BY create_date
</select>
<select id="selectDeviceLogById" parameterType="String" resultMap="DeviceLogResult">
@@ -51,6 +54,7 @@
<if test="projectId != null and projectId != ''">project_id,</if>
<if test="projectName != null and projectName != ''">project_name,</if>
<if test="deviceId != null and deviceId != ''">device_id,</if>
+ <if test="deviceCode != null and deviceCode != ''">device_code,</if>
<if test="deviceName != null and deviceName != ''">device_name,</if>
<if test="type != null and type != ''">type,</if>
<if test="transactionDate != null and transactionDate != ''">transaction_date,</if>
@@ -66,6 +70,7 @@
<if test="projectId != null and projectId != ''">#{projectId},</if>
<if test="projectName != null and projectName != ''">#{projectName},</if>
<if test="deviceId != null and deviceId != ''">#{deviceId},</if>
+ <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
<if test="type != null and type != ''">#{type},</if>
<if test="transactionDate != null and transactionDate != ''">#{transactionDate},</if>
@@ -84,6 +89,7 @@
<if test="projectId != null and projectId != ''">project_id = #{projectId},</if>
<if test="projectName != null and projectName != ''">project_name = #{projectName},</if>
<if test="deviceId != null and deviceId != ''">device_id = #{deviceId},</if>
+ <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
<if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
<if test="type != null and type != ''">type = #{type},</if>
<if test="transactionDate != null and transactionDate != ''">transaction_date = #{transactionDate},</if>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html
index 2dd10eb..ce939cd 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/device/device.html
@@ -54,9 +54,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:device:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:device:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:device:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
index 3e47423..6a96c70 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html
@@ -18,6 +18,12 @@
<input name="projectName" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">璁惧缂栧彿锛�</label>
+ <div class="col-sm-8">
+ <input name="deviceCode" class="form-control" type="text">
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">璁惧鍚嶇О锛�</label>
<div class="col-sm-8">
@@ -61,13 +67,17 @@
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "geo/deviceLog"
+ var projectId = [[${projectId}]];
+
$("#form-deviceLog-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
- $.operate.save(prefix + "/add", $('#form-deviceLog-add').serialize());
+ let formData = $('#form-deviceLog-add').serialize();
+ let data = formData + "&projectId=" + projectId;
+ $.operate.save(prefix + "/add", data);
}
}
</script>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
index 12b106c..8f51043 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
@@ -56,9 +56,12 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:deviceLog:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:deviceLog:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:deviceLog:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
+ <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="geo:deviceLog:import">
+ <i class="fa fa-upload"></i> 瀵煎叆
+ </a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@@ -76,56 +79,61 @@
$(function() {
var options = {
url: prefix + "/list?projectId="+projectId,
- createUrl: prefix + "/add",
+ createUrl: prefix + "/add?projectId="+projectId,
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
+ importUrl: prefix + "/importDeviceLog/"+projectId,
modalName: "璁惧鍑哄叆搴撹褰�",
columns: [{
checkbox: true
},
{
- field : 'id',
+ field : 'id',
title : '涓婚敭',
visible: false
},
{
- field : 'code',
+ field : 'code',
title : '鍑哄叆搴撳崟瀛愬彿'
},
{
- field : 'projectName',
+ field : 'projectName',
title : '椤圭洰鍚嶇О'
},
+ {
+ field : 'deviceCode',
+ title : '璁惧缂栫爜'
+ },
{
- field : 'deviceName',
+ field : 'deviceName',
title : '璁惧鍚嶇О'
},
{
- field : 'type',
+ field : 'type',
title : '鍑哄叆搴撶被鍨�',
formatter: function(value, row, index) {
return $.table.selectDictLabel(typeDatas, value);
}
},
{
- field : 'transactionDate',
+ field : 'transactionDate',
title : '鍑哄叆搴撴椂闂�'
},
{
- field : 'optUser',
+ field : 'optUser',
title : '缁忓姙浜�'
},
{
- field : 'applyUser',
+ field : 'applyUser',
title : '浣跨敤浜�'
},
{
- field : 'number',
+ field : 'number',
title : '鍑哄叆搴撴暟閲�'
},
{
- field : 'remark',
+ field : 'remark',
title : '澶囨敞'
},
{
@@ -141,6 +149,29 @@
};
$.table.init(options);
});
+
+ //涓嬭浇
+ function importTemplate() {
+ var filename="璁惧鍑哄叆搴撹褰曟ā鏉�.xls";
+ window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
+ }
</script>
</body>
+
+<!-- 瀵煎叆鍖哄煙 -->
+<script id="importTpl" type="text/template">
+ <form enctype="multipart/form-data" class="mt20 mb10">
+ <div class="col-xs-offset-1">
+ <input type="file" id="file" name="file"/>
+ <div class="mt10 pt5">
+ <input type="checkbox" id="updateSupport" name="updateSupport" title="瀵煎叆璁惧鍑哄叆搴撲俊鎭俊鎭�"> 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+ <a onclick="importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 涓嬭浇妯℃澘</a>
+ </div>
+ <font color="red" class="pull-left mt10">
+ 鎻愮ず锛氫粎鍏佽瀵煎叆鈥渪ls鈥濇垨鈥渪lsx鈥濇牸寮忔枃浠讹紒
+ </font>
+ </div>
+ </form>
+</script>
+
</html>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
index 0dc7b9c..f789000 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html
@@ -19,6 +19,12 @@
<input name="projectName" th:field="*{projectName}" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">璁惧缂栧彿锛�</label>
+ <div class="col-sm-8">
+ <input name="deviceCode" th:field="*{deviceCode}" class="form-control" type="text">
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">璁惧鍚嶇О锛�</label>
<div class="col-sm-8">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html
index 51aa254..f899d22 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html
@@ -11,24 +11,12 @@
<div class="select-list">
<ul>
<li>
- <p>椤圭洰id锛�</p>
- <input type="text" name="projectId"/>
- </li>
- <li>
<p>鍚嶇О锛�</p>
<input type="text" name="name"/>
</li>
<li>
<p>瑙嗛缂栧彿锛�</p>
<input type="text" name="code"/>
- </li>
- <li>
- <p>缁忓害锛�</p>
- <input type="text" name="lng"/>
- </li>
- <li>
- <p>绾害锛�</p>
- <input type="text" name="lat"/>
</li>
<li>
<p>Ip鍦板潃锛�</p>
@@ -53,9 +41,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectCamera:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectCamera:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectCamera:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
index 176921d..e6eb55f 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
@@ -51,9 +51,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectData:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectData:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectData:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
index 8a22aee..f2c1bc0 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
@@ -44,9 +44,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectPerson:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectPerson:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectPerson:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
--
Gitblit v1.9.1