From 5ac625f324a7bb1656b319348cabfd13467467ef Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 18 五月 2023 15:48:55 +0800
Subject: [PATCH] 数据源配置，通过ui配置application.yml
---
src/main/resources/mapper/DataResourceMapper.xml | 31 +
src/main/java/com/zy/asrs/controller/DataResourceController.java | 147 +++++++
src/main/webapp/views/dataSource/dataSource.html | 368 +++++++++++++++++
src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java | 49 ++
src/main/resources/application-prod.yml | 106 +++++
src/main/java/com/zy/asrs/service/DataResourceService.java | 19
pom.xml | 10
src/main/java/com/zy/common/model/QuotedString.java | 9
src/main/java/com/zy/common/utils/CommonUtils.java | 24 +
src/main/java/com/zy/common/utils/MyRepresenter.java | 27 +
src/main/java/com/zy/common/utils/YamlUtils.java | 205 +++++++++
src/main/java/com/zy/asrs/mapper/DataResourceMapper.java | 20
src/main/java/com/zy/asrs/entity/DataResource.java | 75 +++
src/main/resources/application.yml | 136 ------
14 files changed, 1,092 insertions(+), 134 deletions(-)
diff --git a/pom.xml b/pom.xml
index 35fe389..5919b31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,6 +182,16 @@
<version>1.1.3.3</version>
<systemPath>${project.basedir}/src/main/resources/lib/xpp3-1.1.3.3.jar</systemPath>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.33</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.11.0</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/zy/asrs/controller/DataResourceController.java b/src/main/java/com/zy/asrs/controller/DataResourceController.java
new file mode 100644
index 0000000..b44cc93
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/DataResourceController.java
@@ -0,0 +1,147 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.DataResource;
+import com.zy.asrs.service.DataResourceService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.utils.YamlUtils;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class DataResourceController extends BaseController {
+
+ @Autowired
+ private DataResourceService dataResourceService;
+ @Autowired
+ private YamlUtils yamlUtils;
+
+ @RequestMapping(value = "/dataResource/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(dataResourceService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/dataResource/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<DataResource> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(dataResourceService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/dataResource/tree/auth")
+ @ManagerAuth
+ public R tree(){
+ return R.parse("0-鎿嶄綔鎴愬姛").add(dataResourceService.selectAll());
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/dataResource/add/auth")
+ @ManagerAuth
+ public R add(DataResource dataResource) {
+ dataResourceService.insert(dataResource);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/dataResource/update/auth")
+ @ManagerAuth
+ public R update(DataResource dataResource){
+ if (Cools.isEmpty(dataResource) || null==dataResource.getId()){
+ return R.error();
+ }
+ dataResourceService.updateById(dataResource);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/dataResource/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Integer[] ids){
+ for (Integer id : ids){
+ dataResourceService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/dataResource/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<DataResource> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("dataResource"));
+ convert(map, wrapper);
+ List<DataResource> list = dataResourceService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/dataResourceQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<DataResource> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<DataResource> page = dataResourceService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (DataResource dataResource : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", dataResource.getId());
+ map.put("value", dataResource.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/dataResource/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<DataResource> wrapper = new EntityWrapper<DataResource>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != dataResourceService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(DataResource.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/dataResource/pull/auth")
+ @ManagerAuth
+ public R pull() {
+ //鍒犻櫎鍏ㄩ儴鏁版嵁
+ dataResourceService.delete(new EntityWrapper<>());
+ //鎷夊彇鏁版嵁
+ yamlUtils.read();
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/dataResource/save/auth")
+ public R save() {
+ yamlUtils.update();
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/DataResource.java b/src/main/java/com/zy/asrs/entity/DataResource.java
new file mode 100644
index 0000000..417bec6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/DataResource.java
@@ -0,0 +1,75 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("wcs_data_resource")
+public class DataResource implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value= "")
+ private String data;
+
+ @ApiModelProperty(value= "")
+ private String name;
+
+ @ApiModelProperty(value= "")
+ @TableField("resource_id")
+ private Integer resourceId;
+
+ @ApiModelProperty(value= "")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public DataResource() {}
+
+ public DataResource(String data,String name,Integer resourceId,Date createTime,String memo) {
+ this.data = data;
+ this.name = name;
+ this.resourceId = resourceId;
+ this.createTime = createTime;
+ this.memo = memo;
+ }
+
+// DataResource dataResource = new DataResource(
+// null, //
+// null, //
+// null, //
+// null //
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getMemo() {
+ if (Cools.isEmpty(this.memo)) {
+ return "";
+ }
+ return this.memo;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/DataResourceMapper.java b/src/main/java/com/zy/asrs/mapper/DataResourceMapper.java
new file mode 100644
index 0000000..c6acebb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/DataResourceMapper.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.DataResource;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface DataResourceMapper extends BaseMapper<DataResource> {
+
+ List<DataResource> selectRootData();
+
+ List<DataResource> selectByResourceId(Integer resourceId);
+
+ List<DataResource> selectAll();
+
+}
diff --git a/src/main/java/com/zy/asrs/service/DataResourceService.java b/src/main/java/com/zy/asrs/service/DataResourceService.java
new file mode 100644
index 0000000..e630ecb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/DataResourceService.java
@@ -0,0 +1,19 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.DataResource;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+
+public interface DataResourceService extends IService<DataResource> {
+
+ List<DataResource> selectRootData();
+
+ List<DataResource> selectByResourceId(Integer resourceId);
+
+ //鏄惁鏈夊瓙鑺傜偣
+ boolean hasChild(Integer resourceId);
+
+ List<DataResource> selectAll();
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java
new file mode 100644
index 0000000..7488e74
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java
@@ -0,0 +1,49 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.DataResourceMapper;
+import com.zy.asrs.entity.DataResource;
+import com.zy.asrs.service.DataResourceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("dataResourceService")
+public class DataResourceServiceImpl extends ServiceImpl<DataResourceMapper, DataResource> implements DataResourceService {
+
+ @Override
+ public List<DataResource> selectRootData() {
+ return this.baseMapper.selectRootData();
+ }
+
+ @Override
+ public List<DataResource> selectByResourceId(Integer resourceId) {
+ return this.baseMapper.selectByResourceId(resourceId);
+ }
+
+ @Override
+ public boolean hasChild(Integer resourceId) {
+ List<DataResource> resources = this.baseMapper.selectByResourceId(resourceId);
+ return resources.size() > 0;
+ }
+
+ @Override
+ public List<DataResource> selectAll() {
+ List<DataResource> dataResources = this.baseMapper.selectAll();
+ ArrayList<DataResource> list = new ArrayList<>();//鏅�氭牴鑺傜偣
+ ArrayList<DataResource> listChild = new ArrayList<>();//鏈変笅绾ф牴鑺傜偣
+ for (DataResource dataResource : dataResources) {//灏嗘櫘閫氭暟鎹拰鏈夊瀛愯妭鐐规暟鎹繘琛屽垎鍓�
+ if (this.hasChild(dataResource.getId())) {
+ listChild.add(dataResource);
+ }else {
+ list.add(dataResource);
+ }
+ }
+
+ for (DataResource dataResource : listChild) {//鍚堝苟鏁版嵁
+ list.add(dataResource);
+ }
+ return list;
+ }
+}
diff --git a/src/main/java/com/zy/common/model/QuotedString.java b/src/main/java/com/zy/common/model/QuotedString.java
new file mode 100644
index 0000000..ad784d9
--- /dev/null
+++ b/src/main/java/com/zy/common/model/QuotedString.java
@@ -0,0 +1,9 @@
+package com.zy.common.model;
+
+public class QuotedString {
+
+ public String value;
+ public QuotedString(String value) {
+ this.value = value;
+ }
+}
diff --git a/src/main/java/com/zy/common/utils/CommonUtils.java b/src/main/java/com/zy/common/utils/CommonUtils.java
index d3233b7..8a2e8b6 100644
--- a/src/main/java/com/zy/common/utils/CommonUtils.java
+++ b/src/main/java/com/zy/common/utils/CommonUtils.java
@@ -27,4 +27,28 @@
}
}
+ public static boolean isNumeric(String str) {
+ // 濡傛灉瀛楃涓蹭负绌猴紝鐩存帴杩斿洖false
+ if (str == null || str.length() == 0) {
+ return false;
+ }
+ // 鐢ㄦ鍒欒〃杈惧紡鍖归厤鏁板瓧
+ return str.matches("-?\\d+(\\.\\d+)?");
+ }
+
+ public static boolean isBoolean(String str) {
+ if (str == null) {
+ return false;
+ }
+
+ if (str.length() == 4 || str.length() == 5) {
+ if (str.equals("true") || str.equals("false")) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+
}
diff --git a/src/main/java/com/zy/common/utils/MyRepresenter.java b/src/main/java/com/zy/common/utils/MyRepresenter.java
new file mode 100644
index 0000000..72f6124
--- /dev/null
+++ b/src/main/java/com/zy/common/utils/MyRepresenter.java
@@ -0,0 +1,27 @@
+package com.zy.common.utils;
+
+import com.zy.common.model.QuotedString;
+
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.nodes.Tag;
+import org.yaml.snakeyaml.representer.Represent;
+import org.yaml.snakeyaml.representer.Representer;
+
+public class MyRepresenter extends Representer {
+
+ public MyRepresenter(){
+ this.representers.put(QuotedString.class,new RepresenterQuotedString());
+ }
+ public class RepresenterQuotedString implements Represent {
+ @Override
+ public Node representData(Object o) {
+ if (o instanceof QuotedString) {
+ QuotedString str = (QuotedString) o;
+ return representScalar(Tag.STR, str.value, DumperOptions.ScalarStyle.DOUBLE_QUOTED);
+ }
+ return null;
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/common/utils/YamlUtils.java b/src/main/java/com/zy/common/utils/YamlUtils.java
new file mode 100644
index 0000000..25d8046
--- /dev/null
+++ b/src/main/java/com/zy/common/utils/YamlUtils.java
@@ -0,0 +1,205 @@
+package com.zy.common.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.DataResource;
+import com.zy.asrs.service.DataResourceService;
+import org.apache.commons.io.FileUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
+
+@Component
+public class YamlUtils {
+
+ @Autowired
+ private DataResourceService dataResourceService;
+
+ private static final String src = "src/main/resources/application-prod.yml";
+
+ private final static String C = "#";
+ private final static String CHARSET = "UTF-8";
+
+ //璇诲彇鍚庣殑姣忚鏁版嵁
+ private static List<String> LINES = null;
+
+ public Map<String, Object> read() {
+ Yaml yaml = new Yaml();
+ try {
+ LINES = FileUtils.readLines(new File(src), CHARSET);//璇诲彇鍚庣殑姣忚鏁版嵁
+ Map<String, Object> resultMap = (Map<String, Object>) yaml.load(new FileInputStream(new File(src)));
+ Map<String, Object> wcs = (Map<String, Object>) resultMap.get("wcs-slave");
+ recursion(wcs, null);
+ return wcs;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public void recursion(Map<String, Object> resultMap, DataResource resource) {
+ Iterator<String> iterator = resultMap.keySet().iterator();
+ while (iterator.hasNext()) {
+ String key = iterator.next();
+ Object value = resultMap.get(key);
+
+ DataResource dataResource = new DataResource();
+ if (value == null) {
+ dataResource.setData(null);
+ } else if (value instanceof Map) {
+ dataResource.setData(JSON.toJSONString(value));
+ }else {
+ dataResource.setData(value.toString());
+ }
+ dataResource.setCreateTime(new Date());
+ dataResource.setName(key);
+ if (resource != null) {
+ dataResource.setResourceId(resource.getId());
+ }
+
+ //鑾峰彇澶囨敞
+ String memo = getMemoFromLines(key);
+ dataResource.setMemo(memo);
+
+ dataResourceService.insert(dataResource);
+ if (value instanceof Map) {
+ Map<String, Object> map = (Map<String, Object>) resultMap.get(key);
+ recursion(map, dataResource);
+ }
+
+ }
+ }
+
+ /**
+ * 浠庤鍙栫殑鏁版嵁涓幏鍙栧娉ㄤ俊鎭�
+ */
+ public String getMemoFromLines(String name) {
+ for (int i = 0; i < LINES.size(); i++) {
+ String line = LINES.get(i);
+ String trim = line.trim();
+ String[] split1 = trim.split(":");
+ String lineName = split1[0];
+ if (!lineName.equals(name)) {
+ continue;
+ }
+
+ if (line.contains(C)) {
+ String[] split = trim.split(C);
+ String memo = split[1];//鑾峰彇娉ㄩ噴
+ return memo;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * 璁剧疆澶囨敞鍒板瓧绗︿覆list
+ */
+ public String setMemoToLines(String[] lines) {
+ List<DataResource> dataResources = dataResourceService.selectList(new EntityWrapper<DataResource>().ne("memo", ""));
+ for (DataResource dataResource : dataResources) {
+ String name = dataResource.getName();
+ int idx = 0;
+ for (String line : lines) {
+ String trim = line.trim();
+ String[] split = trim.split(":");
+ String lineName = split[0];
+ if (lineName.equals(name)) {
+ lines[idx] = line + " #" + dataResource.getMemo();
+ }
+ idx++;
+ }
+ }
+
+ StringBuffer sb = new StringBuffer();
+ for (String line : lines) {
+ sb.append(line).append("\n");
+ }
+ return sb.toString();
+ }
+
+ public void update() {
+ Map<String, Object> ymlData = getYmlData();
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("wcs-slave", ymlData);
+ save(hashMap);
+ }
+
+ /**
+ * 灏嗛厤缃俊鎭繚瀛樿嚦鏂囦欢涓�
+ */
+ public void save(Map<String, Object> resultMap) {
+ try {
+ Yaml yaml = new Yaml();
+ FileWriter fileWriter = new FileWriter(new File(src));
+ String dumpAsMap = yaml.dumpAsMap(resultMap);
+ dumpAsMap = dumpAsMap.replaceAll("'", "");
+ String[] lines = dumpAsMap.split("\n");
+ dumpAsMap = setMemoToLines(lines);
+ fileWriter.write(dumpAsMap);
+ fileWriter.flush();
+ fileWriter.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 閬嶅巻鏁版嵁搴撴暟鎹紝杞崲鎴恲ml鏁版嵁
+ */
+ public Map<String, Object> getYmlData() {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ List<DataResource> dataResources = dataResourceService.selectRootData();
+ for (DataResource dataResource : dataResources) {
+ getYmlDataRecursion(dataResource, hashMap);
+ }
+ return hashMap;
+ }
+
+ public void getYmlDataRecursion(DataResource dataResource, Map<String, Object> map) {
+ List<DataResource> resources = dataResourceService.selectByResourceId(dataResource.getId());
+ if (resources.size() > 0) {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ map.put(dataResource.getName(), hashMap);
+ for (DataResource resource : resources) {
+ getYmlDataRecursion(resource, hashMap);
+ }
+ } else {
+ String data = dataResource.getData();
+ map.put(dataResource.getName(), data);
+ }
+ }
+
+ public static void main(String[] args) {
+ Map<String, Integer> keyCountMap = new HashMap<>();
+ try {
+ List<String> lines = FileUtils.readLines(new File(src), CHARSET);
+ for (int i = 0; i < lines.size(); i++) {
+ String line = lines.get(i);
+ if (line.contains(C)) {
+ String[] split = line.split(C);
+ String tmp = split[0];
+ String memo = split[1];//鑾峰彇娉ㄩ噴
+
+ String[] split1 = tmp.split(":");
+ String name = split1[0];
+ String data = split1[1];
+ System.out.println(memo);
+ System.out.println(name);
+ System.out.println(data);
+ }
+ }
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..17820e9
--- /dev/null
+++ b/src/main/resources/application-prod.yml
@@ -0,0 +1,106 @@
+wcs-slave:
+ crn[0]: #鍫嗗灈鏈�1
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ port: 102
+ crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐� #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 210
+ row: 1
+ bay: 41
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2 #鍫嗗灈鏈哄叆搴撶珯鐐�2
+ staNo: 209
+ row: 2
+ bay: 41
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐� #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 105
+ row: 1
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ ip: 10.10.10.3
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1 #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 106
+ row: 2
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ id: 1
+ slot: 0
+ demo: false
+ crn[1]: #鍫嗗灈鏈�2
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ port: 102
+ crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐� #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 206
+ row: 3
+ bay: 41
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2 #鍫嗗灈鏈哄叆搴撶珯鐐�2
+ staNo: 205
+ row: 4
+ bay: 41
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐� #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 109
+ row: 3
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ ip: 10.10.10.10
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1 #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 110
+ row: 4
+ bay: 1
+ lev: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ id: 2
+ slot: 0
+ demo: false
+ doubleLocs: #鍙屾繁搴撲綅鎺掑彿 1,4,5,8,9,12,13,16
+ barcode[1]:
+ port: 51236
+ ip: 10.10.10.52
+ id: 2
+ groupCount: 2 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ devp[0]: #杈撻�佺嚎
+ emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
+ staNo: 201
+ rack: 0
+ emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+ staNo: 101
+ port: 102
+ inSta[0]: #鍏ュ簱鍙�1
+ scale: ${wcs-slave.scale[0].id}
+ staNo: 101
+ barcode: ${wcs-slave.barcode[0].id}
+ ip: 10.10.10.30
+ inSta[1]: #鍏ュ簱鍙�2
+ scale: ${wcs-slave.scale[1].id}
+ staNo: 201
+ barcode: ${wcs-slave.barcode[1].id}
+ id: 1
+ slot: 0
+ outSta[0]: #鍑哄簱鍙�1
+ staNo: 103
+ outSta[1]: #鍑哄簱鍙�2
+ staNo: 203
+ scale[0]: #纾呯Г
+ port: 5005
+ ip: 10.10.10.201
+ id: 1
+ scale[1]: #纾呯Г
+ port: 5005
+ ip: 10.10.10.202
+ id: 2
+ barcode[0]: #鏉＄爜鎵弿浠�
+ port: 51236
+ ip: 10.10.10.52
+ id: 1
+ doubleDeep: false #鍙屾繁
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index df5a64c..42d6275 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -18,6 +18,8 @@
port: 6379
database: 0
# password: xltys1995
+ profiles:
+ active: prod
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
@@ -35,137 +37,3 @@
wms:
url: localhost:8081/htwms3
-
-# 涓嬩綅鏈洪厤缃�
-wcs-slave:
- # 鍙屾繁
- doubleDeep: false
- # 鍙屾繁搴撲綅鎺掑彿
-# 1,4,5,8,9,12,13,16
- doubleLocs:
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 2
- # 鍫嗗灈鏈�1
- crn[0]:
- id: 1
- ip: 10.10.10.3
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 209
- row: 2
- bay: 41
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 210
- row: 1
- bay: 41
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.10
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- row: 4
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 205
- row: 4
- bay: 41
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
- row: 3
- bay: 1
- lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 206
- row: 3
- bay: 41
- lev: 1
-
- # 杈撻�佺嚎
- devp[0]:
- id: 1
- ip: 10.10.10.30
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- scale: ${wcs-slave.scale[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- scale: ${wcs-slave.scale[1].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 101
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 201
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 103
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 203
- # 鏉＄爜鎵弿浠�
- barcode[0]:
- id: 1
- ip: 10.10.10.52
- port: 51236
- barcode[1]:
- id: 2
- ip: 10.10.10.52
- port: 51236
- # 纾呯Г
- scale[0]:
- id: 1
- ip: 10.10.10.201
- port: 5005
- # 纾呯Г
- scale[1]:
- id: 2
- ip: 10.10.10.202
- port: 5005
\ No newline at end of file
diff --git a/src/main/resources/mapper/DataResourceMapper.xml b/src/main/resources/mapper/DataResourceMapper.xml
new file mode 100644
index 0000000..9b0a4a4
--- /dev/null
+++ b/src/main/resources/mapper/DataResourceMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.DataResourceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DataResource">
+ <id column="id" property="id" />
+ <result column="data" property="data" />
+ <result column="name" property="name" />
+ <result column="resource_id" property="resourceId" />
+ <result column="create_time" property="createTime" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+ <select id="selectRootData" resultMap="BaseResultMap">
+ select * from wcs_data_resource
+ where resource_id is null
+ </select>
+
+ <select id="selectByResourceId" resultMap="BaseResultMap">
+ select * from wcs_data_resource
+ where resource_id = #{resourceId}
+ </select>
+
+ <select id="selectAll" resultMap="BaseResultMap">
+ select * from wcs_data_resource
+ order by name
+ </select>
+
+</mapper>
diff --git a/src/main/webapp/views/dataSource/dataSource.html b/src/main/webapp/views/dataSource/dataSource.html
new file mode 100644
index 0000000..72f7d0c
--- /dev/null
+++ b/src/main/webapp/views/dataSource/dataSource.html
@@ -0,0 +1,368 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/wms/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
+ <style>
+ #detail {
+ padding: 25px 30px 0 0;
+ }
+ .ew-tree-table-box {
+ height: 100%;
+ }
+ </style>
+</head>
+<body>
+
+
+<!-- 姝ｆ枃寮�濮� -->
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <!-- 鏁版嵁琛ㄦ牸 -->
+ <table id="dataResource"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <button lay-event="add" class="layui-btn layui-btn-sm icon-btn"><i class="layui-icon"></i>娣诲姞</button>
+ <button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon"></i>鍒犻櫎</button>
+ <button lay-event="pull" class="layui-btn layui-btn-sm icon-btn">鎷夊彇鏁版嵁</button>
+ <button lay-event="save" class="layui-btn layui-btn-sm icon-btn">淇濆瓨鏁版嵁</button>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-del" lay-event="del">鍒犻櫎</a>
+</script>
+
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form" style="margin: 0">
+ <input name="id" type="hidden">
+ <input name="uuid" type="hidden">
+ <input name="level" type="hidden">
+ <div class="layui-row">
+
+ <div class="layui-col-md6">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓婄骇鑿滃崟</label>
+ <div class="layui-input-block">
+ <div id="dataResourceParentSel" class="ew-xmselect-tree"></div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鏁版嵁</label>
+ <div class="layui-input-block">
+ <input name="data" placeholder="璇疯緭鍏ユ暟鎹�" class="layui-input">
+ </div>
+ </div>
+
+ </div>
+
+ <div class="layui-col-md6">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input name="name" placeholder="璇疯緭鍏ュ悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+<script type="text/html" id="typeTpl">
+ {{# if( d.level === 1 ){ }}
+ <span name="level" class="layui-badge layui-badge-green">鑿滃崟</span>
+ {{# } else if(d.level === 2){ }}
+ <span name="level" class="layui-badge layui-badge-green">鑿滃崟</span>
+ {{# } else if(d.level === 3){ }}
+ <span name="level" class="layui-badge layui-badge-gray">鎸夐挳</span>
+ {{# } }}
+</script>
+<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
+
+<script>
+ layui.config({
+ base: baseUrl + "/static/wms/layui/lay/modules/"
+ }).use(['form','treeTable', 'admin', 'xmSelect'], function() {
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+ var admin = layui.admin;
+ var treeTable = layui.treeTable;
+ var xmSelect = layui.xmSelect;
+ var tbDataList = [];
+
+ var insTb = treeTable.render({
+ elem: '#dataResource',
+ url: baseUrl+'/dataResource/tree/auth',
+ headers: {token: localStorage.getItem('token')},
+ height: 'full-200',
+ toolbar: '#toolbar',
+ tree: {
+ iconIndex: 2, // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
+ isPidData: true, // 鏄惁鏄痠d銆乸id褰㈠紡鏁版嵁
+ idName: 'id', // id瀛楁鍚嶇О
+ pidName: 'resourceId' // pid瀛楁鍚嶇О
+ },
+ cols: [[
+ {type: 'checkbox', fixed: 'left'}
+ ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80, hide: true}
+ ,{field: 'name', align: 'left',title: '鍚嶇О'}
+ ,{field: 'data', align: 'center',title: '鏁版嵁', edit:'text'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', edit:'text'}
+ ,{field: 'createTime$', align: 'center',title: '鏃堕棿'}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ done: function (data) {
+ $('.ew-tree-table-box').css('height', '100%');
+ // insTb.expandAll();
+ tbDataList = data;
+ limit();
+ }
+ });
+
+ /* 琛ㄦ牸澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
+ treeTable.on('toolbar(dataResource)', function (obj) {
+ if (obj.event === 'add') { // 娣诲姞
+ showEditModel();
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ var checkRows = insTb.checkStatus();
+ if (checkRows.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkRows.map(function (d) {
+ if (!d.LAY_INDETERMINATE) {
+ return d.id;
+ } else {
+ return null;
+ }
+ });
+ doDel({ids: ids});
+ }else if (obj.event === 'pull') {//鎷夊彇鏁版嵁
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/dataResource/pull/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ insTb.refresh();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }else if (obj.event === 'save') {//淇濆瓨鏁版嵁
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/dataResource/save/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ insTb.refresh();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+ });
+
+ /* 琛ㄦ牸鎿嶄綔鍒楃偣鍑讳簨浠� */
+ treeTable.on('tool(dataResource)', function (obj) {
+ if (obj.event === 'edit') { // 淇敼
+ showEditModel(obj.data);
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ doDel(obj);
+ }
+ });
+
+ // 椤甸潰淇敼
+ treeTable.on('edit(dataResource)', function (obj) {
+ let data = obj.data
+ let modify = true;
+ if (obj.field === 'data'){
+ if (data.data == obj.value) {
+ modify = false;
+ }
+ }else if(obj.field === 'memo') {
+ if (data.memo == obj.value) {
+ modify = false;
+ }
+ }
+
+ if (modify) {
+ data[obj.field] = obj.value;
+ data.createTime = null;
+ let loadIndex = data.LAY_INDEX
+ $.ajax({
+ url: baseUrl+"/dataResource/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ insTb.refresh();
+ setTimeout(function () {
+ insTb.expand(data.field.resourceId);
+ }, 200)
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+
+ }
+
+ });
+
+ /* 鏄剧ず琛ㄥ崟寮圭獥 */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '鏉冮檺',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉琛ㄥ崟鏁版嵁
+ form.val('detail', mData);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(editSubmit)', function (data) {
+ data.field.resourceId = insXmSel.getValue('valueStr');
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/dataResource/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ insTb.refresh();
+ setTimeout(function () {
+ insTb.expand(data.field.resourceId);
+ }, 200)
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+
+ // 娓叉煋涓嬫媺鏍�
+ var insXmSel = xmSelect.render({
+ el: '#dataResourceParentSel',
+ height: '250px',
+ data: insTb.options.data,
+ initValue: mData&&mData.resourceId!=null ? [mData.resourceId] : [],
+ model: {label: {type: 'text'}},
+ prop: {
+ name: 'name',
+ value: 'id'
+ },
+ radio: true,
+ clickClose: true,
+ tree: {
+ show: true,
+ indent: 15,
+ strict: false,
+ expandedKeys: false
+ }
+ });
+ // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function doDel(obj) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ var ids;
+ if (obj.data) {
+ ids = [];
+ ids[0] = obj.data.id;
+ } else {
+ ids = obj.ids;
+ }
+ $.ajax({
+ url: baseUrl+"/dataResource/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ insTb.refresh();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ });
+</script>
+</body>
+</html>
+
--
Gitblit v1.9.1