baibx месяцев назад: 2
Родитель
Сommit
5cf8ff6a86

+ 10 - 10
com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/impl/DeviceServiceImpl.java

@@ -656,16 +656,16 @@ public class DeviceServiceImpl extends AppBaseService implements DeviceService
656
 			logger.info(simsql);
656
 			logger.info(simsql);
657
 			devlst = RCPService.getBaseService().getMapList(simsql);
657
 			devlst = RCPService.getBaseService().getMapList(simsql);
658
 			
658
 			
659
-//			String assist = "";
660
-//			
661
-//			String opsql = "";
662
-//			if(null!=devlst&&devlst.size()>0){
663
-//				opsql = "update devcrond set operate = 1,assist='"+assist+"',state = 0 where devid = '"+devid+"'";
664
-//			}else{
665
-//				opsql = "insert into devcrond (devid,operate,assist) values ('"+devid+"',1,'"+assist+"')";
666
-//			}
667
-//			logger.info(opsql);
668
-//			RCPService.getBaseService().execSql(opsql);
659
+			String assist = "";
660
+
661
+			String opsql = "";
662
+			if(null!=devlst&&devlst.size()>0){
663
+				opsql = "update devcrond set operate = 1,assist='"+assist+"',state = 0 where devid = '"+devid+"'";
664
+			}else{
665
+				opsql = "insert into devcrond (devid,operate,assist) values ('"+devid+"',1,'"+assist+"')";
666
+			}
667
+			logger.info(opsql);
668
+			RCPService.getBaseService().execSql(opsql);
669
 			record.put("msg", "OK");
669
 			record.put("msg", "OK");
670
 		}
670
 		}
671
 		return record;
671
 		return record;

+ 1 - 2
com.sharemao.web.manager/src/main/java/com/sharemao/manager/service/impl/UfiServiceImpl.java

@@ -898,7 +898,6 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
898
 		String grpid = para.get("grpid");
898
 		String grpid = para.get("grpid");
899
 //		String dftsuit = para.get("dftsuit");//是否充值默认套餐
899
 //		String dftsuit = para.get("dftsuit");//是否充值默认套餐
900
 		String mode = para.get("mode");
900
 		String mode = para.get("mode");
901
-        String dftsuit="2".equals(mode)||"3".equals(mode)||"4".equals(mode)?null:"1";
902
 		String copu=para.get("copu");
901
 		String copu=para.get("copu");
903
 		String grpname = para.get("grpname");
902
 		String grpname = para.get("grpname");
904
 		
903
 		
@@ -948,7 +947,7 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
948
 					RCPService.getBaseService().execSql(indevgrpsql);
947
 					RCPService.getBaseService().execSql(indevgrpsql);
949
 					
948
 					
950
 					// 是否充值默认套餐
949
 					// 是否充值默认套餐
951
-					if(ProjectTools.isEmpty(dftsuit))
950
+					if(!"2".equals(mode)&&!"3".equals(mode)&&!"4".equals(mode))
952
 					{
951
 					{
953
 						String usuitsql = "INSERT INTO usersuit(devid,orgid,remain,areaid,packid,effect,invalid,crttm,pkvalue) VALUES ('"+devid+"',"+orgid+",'"+suitval+"',"+ProjectConstants.chinaArea+","+ProjectConstants.testPkgId+","+dateStart+","+dateEnd+","+nowtm+","+suitval+")";
952
 						String usuitsql = "INSERT INTO usersuit(devid,orgid,remain,areaid,packid,effect,invalid,crttm,pkvalue) VALUES ('"+devid+"',"+orgid+",'"+suitval+"',"+ProjectConstants.chinaArea+","+ProjectConstants.testPkgId+","+dateStart+","+dateEnd+","+nowtm+","+suitval+")";
954
 						System.out.println(usuitsql);
953
 						System.out.println(usuitsql);

+ 2 - 2
com.sharemao.web.manager/src/main/webapp/index.jsp

@@ -34,8 +34,8 @@
34
               <input value="登录" style="width:100%;" type="submit">
34
               <input value="登录" style="width:100%;" type="submit">
35
           </form>
35
           </form>
36
       </div>
36
       </div>
37
-      <div class="copyright">赣ICP备2020013427号</div>
38
-      <div class="copyright">Copyright © 2018 - 2022 山东文航电气技术有限公司</div>
37
+      <div class="copyright">粤ICP备2023131131号-4</div>
38
+      <div class="copyright">Copyright © 2018 - 2026 广州小橙信息技术有限公司</div>
39
 </div>
39
 </div>
40
 </body>
40
 </body>
41
 </html>
41
 </html>