添加用户信息

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteDynamicPropertiesServiceImpl.java

@@ -1,19 +1,16 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.SiteDynamicProperties;
-import com.bizmatics.model.UserSite;
+import com.bizmatics.model.system.SysUser;
 import com.bizmatics.persistence.mapper.SiteDynamicPropertiesMapper;
 import com.bizmatics.service.SiteDynamicPropertiesService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.service.util.SessionLocal;
-import org.apache.ibatis.annotations.Param;
+import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 
 /**
  * <p>
@@ -25,6 +22,7 @@ import java.util.Date;
  */
 @Service
 public class SiteDynamicPropertiesServiceImpl extends AbstractCrudService<SiteDynamicPropertiesMapper, SiteDynamicProperties> implements SiteDynamicPropertiesService {
+    @Override
     public void SiteDynamicPropertiesAdd(String fault_status, String real_time_load, String total_electricity, String power_factor, int site_id, String site_type,
                                          String user_company, String operation_time, String service_deadline, String power_supply_type, String voltage_level,
                                          String Demolition_standard_coal, String Demolition_standard_coal1,String sitePictureOne,String sitePictureTwo,String sitePictureThree){
@@ -43,7 +41,8 @@ public class SiteDynamicPropertiesServiceImpl extends AbstractCrudService<SiteDy
         site_dynamic_properties.setVoltageLevel(voltage_level);
         site_dynamic_properties.setDemolitionStandardCoal(Integer.parseInt(Demolition_standard_coal));
         site_dynamic_properties.setDemolitionStandardCoal1(Demolition_standard_coal1);
-        site_dynamic_properties.setCreator(SessionLocal.getUser().getUserName());
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        site_dynamic_properties.setCreator(user.getUserName());
         site_dynamic_properties.setCreateTime(LocalDateTime.now());
         site_dynamic_properties.setSitePictureOne(sitePictureOne);
         site_dynamic_properties.setSitePictureTwo(sitePictureTwo);
@@ -51,7 +50,7 @@ public class SiteDynamicPropertiesServiceImpl extends AbstractCrudService<SiteDy
         this.save(site_dynamic_properties);
     }
 
-
+    @Override
     public void SiteDynamicPropertiesUpdate(SiteDynamicProperties siteDynamicProperties){
         this.updateById(siteDynamicProperties);
     }

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteGroupingServiceImpl.java

@@ -1,12 +1,11 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.SiteGrouping;
+import com.bizmatics.model.system.SysUser;
 import com.bizmatics.persistence.mapper.SiteGroupingMapper;
 import com.bizmatics.service.SiteGroupingService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.service.util.SessionLocal;
-import org.apache.poi.hpsf.Date;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -22,14 +21,17 @@ import java.time.LocalDateTime;
 @Service
 public class SiteGroupingServiceImpl extends AbstractCrudService<SiteGroupingMapper, SiteGrouping> implements SiteGroupingService {
 
+    @Override
     public void SiteGroupingAdd(String groupingName){
+        SysUser user = SecurityUtils.getLoginUser().getUser();
         SiteGrouping siteGrouping = new SiteGrouping();
         siteGrouping.setGroupingName(groupingName);
-        siteGrouping.setCreator(SessionLocal.getUser().getUserName());
+        siteGrouping.setCreator(user.getUserName());
         siteGrouping.setCreationTime(LocalDateTime.now());
         this.save(siteGrouping);
     }
 
+    @Override
     public void SiteGroupingUpdate(String groupingName,int id){
         SiteGrouping siteGrouping = new SiteGrouping();
         siteGrouping.setGroupingName(groupingName);

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -7,6 +7,7 @@ import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.BeanMapperUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.*;
+import com.bizmatics.model.system.SysUser;
 import com.bizmatics.persistence.mapper.AlarmPowerMapper;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.SiteMapper;
@@ -19,7 +20,6 @@ import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -68,8 +68,11 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     public List<Site> list(String name) {
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
         return baseMapper.list(userId, name);
-        return baseMapper.list(SessionLocal.getUserId(), name);
+    }
 
+    @Override
+    public List<Map<String, Object>> Sitelist(String name) {
+        return null;
     }
 
     @Override
@@ -136,6 +139,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         siteVo.setDeviceType(deviceTypes);
         return siteVo;
     }
+    @Override
     public void SiteAdd(String site_name,String site_address,String user_name,String phone,
                         String station_area_id,String route_id,String installed_capacity,String rheological_change,String longitude,
                         String latitude,String region,String grouping_id,String fault_status, String real_time_load,
@@ -144,6 +148,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
                         String Demolition_standard_coal, String Demolition_standard_coal1,String sitePictureOne,
                         String sitePictureTwo,String sitePictureThree,String templateId){
 
+        SysUser user = SecurityUtils.getLoginUser().getUser();
         if (templateId.equals("")){
             Site site=new Site();
             site.setSiteName(site_name);
@@ -159,7 +164,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
             site.setLatitude(latitude);
             site.setRegion(Integer.parseInt(region));
             site.setCreateTime(new Date());
-            site.setCreator(SessionLocal.getUser().getUserName());
+            site.setCreator(user.getUserName());
             site.setEnable(1);
             site.setGroupingId(Integer.parseInt(grouping_id));
             this.save(site);
@@ -186,7 +191,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
             site.setLatitude(TemplateDataListOne.getLatitude());
             site.setRegion(TemplateDataListOne.getRegion());
             site.setCreateTime(new Date());
-            site.setCreator(SessionLocal.getUser().getUserName());
+            site.setCreator(user.getUserName());
             site.setEnable(1);
 //            site.setGroupingId(TemplateDataListOne.getGroupingId());
             this.save(site);
@@ -204,7 +209,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     }
 
 
-
+    @Override
     public List<TemplateData> GetSite(String id){
         List<TemplateData> TemplateDataList = null;
         TemplateDataList = baseMapper.templateQuery(Integer.parseInt(id));
@@ -212,7 +217,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         return TemplateDataList;
     }
 
-
+    @Override
     public void SiteUpdate(String id,String site_name,String site_address,String user_name,String phone,
                            String station_area_id,String route_id,String installed_capacity,String rheological_change,String longitude,
                            String latitude,String region,String grouping_id,String fault_status, String real_time_load,
@@ -314,7 +319,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         this.updateById(SiteList1);
         siteDynamicPropertiesService.SiteDynamicPropertiesUpdate(SiteDynamicPropertiesList1);
     }
-
+    @Override
     public void Sitedel(String id){
         List<Site> SiteList = null;
         SiteList = baseMapper.list1(Integer.parseInt(id));

fiveep-service/src/main/java/com/bizmatics/service/impl/UserSiteServiceImpl.java

@@ -2,11 +2,12 @@ package com.bizmatics.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.UserSite;
+import com.bizmatics.model.system.SysUser;
 import com.bizmatics.persistence.mapper.UserSiteMapper;
 import com.bizmatics.service.UserSiteService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.service.util.SessionLocal;
+import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -26,12 +27,12 @@ public class UserSiteServiceImpl extends AbstractCrudService<UserSiteMapper, Use
         queryWrapper.eq(UserSite::getUserId,userId);
         return this.count(queryWrapper);
     }
-
+    @Override
     public void UserSiteAdd(int SiteId){
-        Integer user_id = SessionLocal.getUserId();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
         UserSite usersite = new UserSite();
         usersite.setSiteId(SiteId);
-        usersite.setUserId(user_id);
+        usersite.setUserId(user.getUserId().intValue());
         this.save(usersite);
     }
 }