bug修复
This commit is contained in:
parent
991cef191d
commit
428a738d4a
@ -219,7 +219,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
||||
if (baseRole == null) {
|
||||
result.put("seeEquipment", 1);
|
||||
} else {
|
||||
result.put("seeEquipment", baseRole.getSeeEquipment());
|
||||
result.put("seeEquipment", Integer.valueOf(baseRole.getSeeEquipment()));
|
||||
}
|
||||
} else {
|
||||
result.put("seeEquipment", 0);
|
||||
|
||||
@ -1,62 +1,82 @@
|
||||
package com.zhgd.xmgl.modules.file.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
/**
|
||||
* @Description: 项目文件档案
|
||||
* @author： pds
|
||||
* @date： 2021-01-11
|
||||
* @date： 2021-01-11
|
||||
* @version： V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("project_file")
|
||||
@ApiModel(value="ProjectFile实体类",description="ProjectFile")
|
||||
@ApiModel(value = "ProjectFile实体类", description = "ProjectFile")
|
||||
public class ProjectFile implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**fileId*/
|
||||
@Excel(name = "fileId", width = 15)
|
||||
/**
|
||||
* fileId
|
||||
*/
|
||||
@Excel(name = "fileId", width = 15)
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value="fileId")
|
||||
private java.lang.Long fileId ;
|
||||
/**项目SN*/
|
||||
@Excel(name = "项目SN", width = 15)
|
||||
@ApiModelProperty(value="项目SN")
|
||||
private java.lang.String projectSn ;
|
||||
/**文件名*/
|
||||
@Excel(name = "文件名", width = 15)
|
||||
@ApiModelProperty(value="文件名")
|
||||
private java.lang.String fileName ;
|
||||
/**文件路径*/
|
||||
@Excel(name = "文件路径", width = 15)
|
||||
@ApiModelProperty(value="文件路径")
|
||||
private java.lang.String filePath ;
|
||||
/**扩展名*/
|
||||
@Excel(name = "扩展名", width = 15)
|
||||
@ApiModelProperty(value="扩展名")
|
||||
private java.lang.String extendName ;
|
||||
/**是否是目录 0-否, 1-是*/
|
||||
@Excel(name = "是否是目录 0-否, 1-是", width = 15)
|
||||
@ApiModelProperty(value="是否是目录 0-否, 1-是")
|
||||
private java.lang.Integer isDir ;
|
||||
/**文件url*/
|
||||
@Excel(name = "文件url", width = 15)
|
||||
@ApiModelProperty(value="文件url")
|
||||
private java.lang.String fileUrl ;
|
||||
/**上传时间*/
|
||||
@Excel(name = "上传时间", width = 15)
|
||||
@ApiModelProperty(value="上传时间")
|
||||
private java.lang.String uploadTime ;
|
||||
@ApiModelProperty(value = "fileId")
|
||||
private java.lang.Long fileId;
|
||||
/**
|
||||
* 项目SN
|
||||
*/
|
||||
@Excel(name = "项目SN", width = 15)
|
||||
@ApiModelProperty(value = "项目SN")
|
||||
private java.lang.String projectSn;
|
||||
/**
|
||||
* 文件名
|
||||
*/
|
||||
@Excel(name = "文件名", width = 15)
|
||||
@ApiModelProperty(value = "文件名")
|
||||
private java.lang.String fileName;
|
||||
/**
|
||||
* 文件路径
|
||||
*/
|
||||
@Excel(name = "文件路径", width = 15)
|
||||
@ApiModelProperty(value = "文件路径")
|
||||
private java.lang.String filePath;
|
||||
/**
|
||||
* 扩展名
|
||||
*/
|
||||
@Excel(name = "扩展名", width = 15)
|
||||
@ApiModelProperty(value = "扩展名")
|
||||
private java.lang.String extendName;
|
||||
/**
|
||||
* 是否是目录 0-否, 1-是
|
||||
*/
|
||||
@Excel(name = "是否是目录 0-否, 1-是", width = 15)
|
||||
@ApiModelProperty(value = "是否是目录 0-否, 1-是")
|
||||
private java.lang.Integer isDir;
|
||||
/**
|
||||
* 文件url
|
||||
*/
|
||||
@Excel(name = "文件url", width = 15)
|
||||
@ApiModelProperty(value = "文件url")
|
||||
private java.lang.String fileUrl;
|
||||
/**
|
||||
* 上传时间
|
||||
*/
|
||||
@Excel(name = "上传时间", width = 15)
|
||||
@ApiModelProperty(value = "上传时间")
|
||||
private java.lang.String uploadTime;
|
||||
|
||||
@ApiModelProperty(value="文件大小")
|
||||
private java.lang.String fileSize ;
|
||||
@ApiModelProperty(value = "文件大小")
|
||||
private java.lang.String fileSize;
|
||||
|
||||
@ApiModelProperty(value = "企业sn")
|
||||
@TableField(exist = false)
|
||||
private java.lang.String sn;
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
<select id="selectWorkerAttendancePage" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
|
||||
SELECT a.*,
|
||||
IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url,code_state,
|
||||
b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url
|
||||
b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url,b.worker_classify
|
||||
from worker_attendance a LEFT JOIN worker_info b ON a.person_sn=b.person_sn
|
||||
LEFT JOIN team_info c ON b.team_id=c.id
|
||||
LEFT JOIN department_info d ON b.department_id=d.id
|
||||
@ -686,4 +686,4 @@
|
||||
and wa.project_sn = #{q.projectCode}
|
||||
</if>
|
||||
</select>
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
package com.zhgd.xmgl.util;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
/**
|
||||
* @program: wisdomSite
|
||||
* @description: 风向
|
||||
@ -7,6 +9,7 @@ package com.zhgd.xmgl.util;
|
||||
* @create: 2020-10-12 15:57
|
||||
**/
|
||||
|
||||
@Slf4j
|
||||
public class WindDirectionUtils {
|
||||
|
||||
public static String getWindDirectionName(String winddirection) {
|
||||
@ -69,7 +72,7 @@ public class WindDirectionUtils {
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
log.error("err:", e);
|
||||
}
|
||||
|
||||
return winddirectionName;
|
||||
|
||||
97
src/main/resources/application-gsx-other-env-show.properties
Normal file
97
src/main/resources/application-gsx-other-env-show.properties
Normal file
@ -0,0 +1,97 @@
|
||||
#http.port=30250
|
||||
http.port=23912
|
||||
#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
||||
#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC
|
||||
#spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
||||
#spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
||||
#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
|
||||
#spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
||||
spring.datasource.url=jdbc:mysql://192.168.34.221:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
|
||||
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
|
||||
#spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
|
||||
spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
|
||||
server.port=30002
|
||||
#server.port=30246
|
||||
basePath=C:/jxj/prod/backEnd/itbgpImage/
|
||||
server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/
|
||||
#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll
|
||||
#basePath=F:/zhgd/itbgpImage/
|
||||
#server.tomcat.basedir=F:/zhgd/tempImage/
|
||||
#arcsoft.dllPath=F:/zhgd/dll
|
||||
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
|
||||
security.enable=false
|
||||
isGetStandardData=false
|
||||
isGetEnvironmentData=false
|
||||
isGetFaceFeatureDate=false
|
||||
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
|
||||
video.alarm.newUrl=223.82.100.80:6040
|
||||
wx-appid=
|
||||
wx-AppSecret=
|
||||
mqtt-scope=zjsjTopic
|
||||
serverUrl=http://124.71.67.160:8088/
|
||||
#serverUrl=http://182.90.224.237:7000
|
||||
#serverUrl=http://127.0.0.1:6023
|
||||
#\u89C6\u9891\u5206\u6790url
|
||||
video-analysis-url=
|
||||
server.ssl.enabled=false
|
||||
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
|
||||
defaultZwComapnySn=
|
||||
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
|
||||
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
|
||||
spring.file-storage.default-platform=local
|
||||
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
|
||||
spring.file-storage.thumbnail-suffix=.jpg
|
||||
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
|
||||
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
|
||||
spring.file-storage.local[0].platform=local
|
||||
#\u542F\u7528\u5B58\u50A8
|
||||
spring.file-storage.local[0].enable-storage=true
|
||||
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
|
||||
spring.file-storage.local[0].enable-access=false
|
||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
|
||||
spring.file-storage.local[0].domain=
|
||||
# \u5B58\u50A8\u5730\u5740
|
||||
spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/
|
||||
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
|
||||
spring.file-storage.local[0].path-patterns=
|
||||
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
|
||||
spring.file-storage.aliyun-oss[0].enable-storage=false
|
||||
spring.file-storage.aliyun-oss[0].access-key=
|
||||
spring.file-storage.aliyun-oss[0].secret-key=
|
||||
spring.file-storage.aliyun-oss[0].end-point=
|
||||
spring.file-storage.aliyun-oss[0].bucket-name=
|
||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
|
||||
spring.file-storage.aliyun-oss[0].domain=
|
||||
spring.file-storage.aliyun-oss[0].base-path=
|
||||
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
|
||||
spring.boot.admin.client.instance.service-url=http://localhost:18070
|
||||
spring.boot.admin.client.instance.name=zjsj
|
||||
# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740
|
||||
double-carbon.water-data-url=http://test.cesms.net
|
||||
double-carbon.ammeter-data-url=http://test.cesms.net
|
||||
license.licensePath=C:/jxj/prod/backEnd/license/license.lic
|
||||
license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore
|
||||
#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u7684\u6570\u636E\u540C\u6B65
|
||||
#\u4E09\u6C5Fmq\u768461616\u7AEF\u53E3\u5BF9\u5E94\u7684\u5730\u5740
|
||||
uop_sync_mq_brokerurl=tcp://116.169.63.183:31089
|
||||
#\u4E09\u6C5Fmq\u7684\u7528\u6237\u540D
|
||||
uop_sync_mq_username=admin
|
||||
#\u4E09\u6C5Fmq\u7684\u5BC6\u7801
|
||||
uop_sync_mq_password=admin
|
||||
#\u4E09\u6C5F\u5F00\u542F\u6D88\u606F\u63A5\u6536
|
||||
c2_orguser_subscription=true
|
||||
#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u5730\u5740
|
||||
sj.unifiedAuthentication.login.url=http://116.169.63.183:30913
|
||||
#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u8DF3\u8F6C\u540E\u63A5\u6536code\u7684\u5730\u5740
|
||||
#sj.unifiedAuthentication.login.code.url=http://wbtqry.natappfree.cc/xmgl/sj/unifiedAuthentication/getTokenByCode
|
||||
#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u540E\u8DF3\u8F6Curl\uFF08pc\u7AEF\uFF09
|
||||
sj.unifiedAuthentication.success.redirect=http://192.168.34.226:8080/index.html#/login?UID=
|
||||
#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u540E\u8DF3\u8F6Curl\uFF08app\u7AEF\uFF09
|
||||
sj.unifiedAuthentication.success.redirect.app=http://192.168.34.226:8088/zjsjAPP/#/pages/projectManage/projectManage?UID=
|
||||
#\u4E09\u6C5F\u4E1A\u52A1\u4E2D\u53F0\u7F51\u5173\u5730\u5740
|
||||
sj.business.gateway.url=http://116.169.63.183:30867/
|
||||
#\u4E09\u6C5F\u4E1A\u52A1\u4E2D\u53F0\u7F51\u5173\u5730\u5740\u7684\u8C03\u7528\u51ED\u8BC1
|
||||
sj.business.gateway.api.key=nDmkHCxlQzCqE-xfYteXMw
|
||||
#\u4E09\u6C5F\u56FE\u7247\u8BBF\u95EE\u8DEF\u5F84\uFF08\u7528\u4E8E\u63A8\u9001\u4E1A\u52A1\u4E2D\u53F0\uFF09
|
||||
sj.upload.image.url.prefix=http://192.168.34.221:11111/image/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user