最新提交

center-data/src/main/resources/application-prod.properties

@@ -14,13 +14,13 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # 数据源配置
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # 云模服务器对应的数据库
-#spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#spring.datasource.username=root
-#spring.datasource.password=p011430seya1026
+spring.datasource.url=jdbc:mysql://localhost:3306/geminidatabridge_yun?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.username=root
+spring.datasource.password=p011430seya1026
 # 我们测试的自己服务器数据库
-spring.datasource.url=jdbc:mysql://12.18.128.247:3306/geminidatabridge?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-spring.datasource.username=appUser
-spring.datasource.password=appUser
+#spring.datasource.url=jdbc:mysql://12.18.128.247:3306/geminidatabridge?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.username=appUser
+#spring.datasource.password=appUser
 #spring.datasource.druid.test-on-borrow=true
 #spring.datasource.druid.test-while-idle=true
 # ####################################################################################################

pcbms/src/main/java/com/hssx/pcbms/controller/ProjectController.java

@@ -22,7 +22,7 @@ public class ProjectController {
     @Autowired
     private ProjectService projectService;
 
-    @ApiOperation(value = "单位列表", notes = "单位列表")
+    @ApiOperation(value = "项目列表", notes = "项目列表")
     @RequestMapping("/list")
     public HttpRespMsg list(Project project, PageUtil page) {
         return projectService.getList(project,page);

pcbms/src/main/java/com/hssx/pcbms/entity/Goods.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-12-13
+ * @since 2019-12-16
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -215,6 +215,12 @@ public class Goods extends Model<Goods> {
     @TableField("device_factory")
     private String deviceFactory;
 
+    /**
+     * 申请人
+     */
+    @TableField("petitioner")
+    private String petitioner;
+
 
     @Override
     protected Serializable pkVal() {

pcbms/src/main/java/com/hssx/pcbms/entity/UserRole.java

@@ -3,6 +3,7 @@ package com.hssx.pcbms.entity;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.ArrayList;
 
 /**
  * <p>
@@ -57,4 +58,26 @@ public class UserRole extends Model<UserRole> {
         ", roleId=" + roleId +
         "}";
     }
+
+    public static void main(String[] args) {
+        String a = "hehe";
+        String b = "he"+"he";
+        String c = new String("hehe");
+        String d = new String("hehe");
+        System.out.println(a==b);
+        System.out.println(a==c);
+        System.out.println(a==a.intern());
+        System.out.println(c==d);
+        ArrayList<String> list = new ArrayList<>();
+        list.add("j");
+        list.add("k");
+        list.add("j");
+        list.add("j");
+        for (int i = list.size()-1 ;i>=0;i--) {
+            if(list.get(i).equals("j")){
+                list.remove(i);
+            }
+        }
+        System.out.println(list);
+    }
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/ProjectServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.pcbms.util.HttpRespMsg;
 import com.hssx.pcbms.util.PageUtil;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 
 /**

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("unit","project");
+        strategy.setInclude("goods");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

pcbms/src/main/resources/application-prod.properties

@@ -21,7 +21,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.password=p011430seya1026
 spring.datasource.url=jdbc:mysql://localhost:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=p011430seya1026
+spring.datasource.password=Ls123456
 #spring.datasource.druid.test-on-borrow=true
 #spring.datasource.druid.test-while-idle=true
 # ####################################################################################################
@@ -42,7 +42,9 @@ spring.thymeleaf.prefix=classpath:/static/
 #spring.redis.port=6379
 ######################################################################################################
 # 文件上传路径
-upload.path=E:/staticproject/lsbms/upload/
+#upload.path=E:/staticproject/lsbms/upload/
+upload.path=/center/nginx/staticproject/lsbms/upload/
+
 # 备用密码
 sysPwd=lsbms
 ######################################################################################################
@@ -57,6 +59,6 @@ spring.datasource.hikari.max-lifetime =30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 ########################################################################################################
 # 日志
-logging.path=E:/staticproject/lsbms/
+logging.path=/center/nginx/staticproject/lsbms/
 open.door.url=http://localhost:8080/racksystem/openDoor.do
 

pcbms/src/main/resources/mapper/GoodsMapper.xml

@@ -35,13 +35,15 @@
         <result column="room_id" property="roomId" />
         <result column="room_name" property="roomName" />
         <result column="device_factory" property="deviceFactory" />
+        <result column="petitioner" property="petitioner" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, tag_id, model_number, unit, address, factory, pic, service_life, next_indate, is_delete, creator_id, division_code, suffix_code, good_type, rack_id, rack_ip, rack_port, indate, project_no, project_name, purchase_date, warranty_period, price, content, goods_sequence, device_contact, device_contact_phone, room_id, room_name, device_factory
+        id, name, tag_id, model_number, unit, address, factory, pic, service_life, next_indate, is_delete, creator_id, division_code, suffix_code, good_type, rack_id, rack_ip, rack_port, indate, project_no, project_name, purchase_date, warranty_period, price, content, goods_sequence, device_contact, device_contact_phone, room_id, room_name, device_factory, petitioner
     </sql>
 
+
     <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.GoodsVO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
@@ -86,6 +88,7 @@
         <result column="warranty_period" property="warrantyPeriod" />
         <result column="price" property="price" />
         <result column="content" property="content" />
+        <result column="petitioner" property="petitioner" />
         <collection property="goodsNos" ofType="com.hssx.pcbms.entity.GoodsNo">
             <id column="nid" property="id"/>
             <result column="model_no" property="modelNo"/>
@@ -129,6 +132,8 @@
         <result column="device_contact" property="deviceContact" />
         <result column="device_contact_phone" property="deviceContactPhone" />
         <result column="device_factory" property="deviceFactory" />
+        <result column="gindate" property="indate" />
+        <result column="petitioner" property="petitioner" />
         <collection property="goodsNosVO" ofType="com.hssx.pcbms.entity.vo.GoodsNoVO">
             <id column="nid" property="id"/>
             <result column="model_no" property="modelNo" />
@@ -260,9 +265,9 @@
     </select>
     <select id="getDetail" resultMap="BaseResultMapDetail">
         select
-        g.id, g.name, g.tag_id,gt.name tag_name, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,
-        g.is_delete,gn.id nid,g.good_type,rd.hum,rd.door_status,rd.temp,g.project_no, g.project_name, g.purchase_date, g.warranty_period, g.price,g.content,
-        gn.model_no, gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id, gn.user_id,u.name username,gn.is_maintain,u.phone,g.goods_sequence, g.device_contact, g.device_contact_phone,g.device_factory
+        g.id, g.name, g.tag_id,gt.name tag_name, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,g.indate gindate,
+        g.is_delete,gn.id nid,g.good_type,rd.hum,rd.door_status,rd.temp,g.project_no, g.project_name, g.purchase_date, g.warranty_period, g.price,g.content,g.petitioner,
+        gn.model_no, gn.division_code, gn.suffix_code, gn.state, gn.goods_id, gn.user_id,u.name username,gn.is_maintain,u.phone,g.goods_sequence, g.device_contact, g.device_contact_phone,g.device_factory
         from
         goods g
         left join

pcbms/src/main/resources/mapper/UserMapper.xml

@@ -70,7 +70,7 @@
         FROM
         department dt
         left join
-        USER u
+        user u
         ON u.dept_id = dt.department_guid
         LEFT JOIN user_role ur
         ON u.id = ur.user_id
@@ -82,7 +82,7 @@
         select
             u.id,u.head_url,u.name
         from
-            USER u
+            user u
         LEFT JOIN user_role ur
         ON u.id = ur.user_id
         LEFT JOIN sys_role sr
@@ -93,7 +93,7 @@
         select
             u.id,u.head_url,u.name
         from
-            USER u
+            user u
         LEFT JOIN user_role ur
         ON u.id = ur.user_id
         LEFT JOIN sys_role sr